From duncan at codespeak.net Wed Mar 1 11:17:45 2006 From: duncan at codespeak.net (duncan@codespeak.net) Date: Wed Mar 1 11:17:47 2006 Subject: [kupu-checkins] r23824 - kupu/trunk/kupu/plone Message-ID: <20060301101745.E76FB10079@code0.codespeak.net> Author: duncan Date: Wed Mar 1 11:17:44 2006 New Revision: 23824 Modified: kupu/trunk/kupu/plone/plonedrawers.py Log: Added support for using the reference browser in ATTopic criteria. Modified: kupu/trunk/kupu/plone/plonedrawers.py ============================================================================== --- kupu/trunk/kupu/plone/plonedrawers.py (original) +++ kupu/trunk/kupu/plone/plonedrawers.py Wed Mar 1 11:17:44 2006 @@ -47,7 +47,12 @@ else: # Must be portal_type.fieldname typename, fieldname = parts - __traceback_info__ = (typename, fieldname) + # Topic criteria have typename and fieldname embedded in + # the criteria name. + if fieldname.startswith('crit__'): + typename, fieldname = fieldname.split('_')[-2:] + + __traceback_info__ = (parts, typename, fieldname) archetype_tool = getToolByName(tool, 'archetype_tool', None) types = archetype_tool.listRegisteredTypes() typeinfo = [t for t in types if t['portal_type']==typename] @@ -121,7 +126,9 @@ # saved. The UID won't be in the catalog so we need to create # a dummy object instead. tool = self._tool - UID = tool.REQUEST.instance + UID = tool.REQUEST.get('instance', None) + if UID is None: + return None reference_tool = getToolByName(tool, 'reference_catalog') self._instance = reference_tool.lookupObject(UID) @@ -432,7 +439,7 @@ # doesn't match the original query. query2 = {} if link_types: - query2['portal_type'] = link_types + coll_types + query2['portal_type'] = link_types + list(coll_types) else: query2['portal_type'] = () From duncan at codespeak.net Wed Mar 1 16:45:23 2006 From: duncan at codespeak.net (duncan@codespeak.net) Date: Wed Mar 1 16:45:24 2006 Subject: [kupu-checkins] r23835 - kupu/trunk/kupu/plone Message-ID: <20060301154523.4B92F1007B@code0.codespeak.net> Author: duncan Date: Wed Mar 1 16:45:21 2006 New Revision: 23835 Modified: kupu/trunk/kupu/plone/plonedrawers.py Log: Type mismatch error Modified: kupu/trunk/kupu/plone/plonedrawers.py ============================================================================== --- kupu/trunk/kupu/plone/plonedrawers.py (original) +++ kupu/trunk/kupu/plone/plonedrawers.py Wed Mar 1 16:45:21 2006 @@ -439,7 +439,7 @@ # doesn't match the original query. query2 = {} if link_types: - query2['portal_type'] = link_types + list(coll_types) + query2['portal_type'] = tuple(link_types) + tuple(coll_types) else: query2['portal_type'] = () From limi at codespeak.net Mon Mar 6 02:40:12 2006 From: limi at codespeak.net (limi@codespeak.net) Date: Mon Mar 6 02:40:20 2006 Subject: [kupu-checkins] r24003 - in kupu/branch/plone-2.1/plone: . kupu_plone_layer Message-ID: <20060306014012.33236100B9@code0.codespeak.net> Author: limi Date: Mon Mar 6 02:40:07 2006 New Revision: 24003 Modified: kupu/branch/plone-2.1/plone/body.kupu kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html kupu/branch/plone-2.1/plone/toolbar.kupu Log: Fixing tabindex behaviour for Martin's changes on Plone 2.1 branch. Modified: kupu/branch/plone-2.1/plone/body.kupu ============================================================================== --- kupu/branch/plone-2.1/plone/body.kupu (original) +++ kupu/branch/plone-2.1/plone/body.kupu Mon Mar 6 02:40:07 2006 @@ -18,7 +18,8 @@ posfactory python:base.find('/portal_factory/'); base python:posfactory > 0 and base[:posfactory+15] or base; base kupu_base_override|base;" - tal:attributes="src string:${base}/emptypage; tabindex python:tabindex+1;" + tal:attributes="src string:${base}/emptypage; + tabindex python:tabindex is not None and tabindex + 1 or None;" > - + @@ -120,7 +120,7 @@ @@ -351,7 +351,7 @@ - Modified: kupu/branch/plone-2.1/plone/toolbar.kupu ============================================================================== --- kupu/branch/plone-2.1/plone/toolbar.kupu (original) +++ kupu/branch/plone-2.1/plone/toolbar.kupu Mon Mar 6 02:40:07 2006 @@ -12,7 +12,7 @@ From duncan at codespeak.net Mon Mar 6 14:15:57 2006 From: duncan at codespeak.net (duncan@codespeak.net) Date: Mon Mar 6 14:15:59 2006 Subject: [kupu-checkins] r24017 - kupu/branch/kupu-1.3/plone Message-ID: <20060306131557.75E26100A3@code0.codespeak.net> Author: duncan Date: Mon Mar 6 14:15:56 2006 New Revision: 24017 Modified: kupu/branch/kupu-1.3/plone/drawers.kupu Log: Fix for fields which have no default_output_type. (for this branch only: the trunk has different code entirely here.) Modified: kupu/branch/kupu-1.3/plone/drawers.kupu ============================================================================== --- kupu/branch/kupu-1.3/plone/drawers.kupu (original) +++ kupu/branch/kupu-1.3/plone/drawers.kupu Mon Mar 6 14:15:56 2006 @@ -16,7 +16,8 @@ + default_output_type field/default_output_type|nothing; + usecaptions python:default_output_type=='text/x-html-captioned'"> 1 From duncan at codespeak.net Thu Mar 9 17:42:01 2006 From: duncan at codespeak.net (duncan@codespeak.net) Date: Thu Mar 9 17:42:03 2006 Subject: [kupu-checkins] r24184 - kupu/trunk/kupu/plone/kupu_references Message-ID: <20060309164201.5ADBF1008B@code0.codespeak.net> Author: duncan Date: Thu Mar 9 17:41:59 2006 New Revision: 24184 Modified: kupu/trunk/kupu/plone/kupu_references/referencebrowser.js Log: Reference browsing on IE when there isn't a real kupu on the page threw an error. Modified: kupu/trunk/kupu/plone/kupu_references/referencebrowser.js ============================================================================== --- kupu/trunk/kupu/plone/kupu_references/referencebrowser.js (original) +++ kupu/trunk/kupu/plone/kupu_references/referencebrowser.js Thu Mar 9 17:41:59 2006 @@ -135,6 +135,7 @@ this.resumeEditing = function() {}; this.suspendEditing = function() {}; this.config = {}; + this._saveSelection = function() {}; }; var drawertool; From mihxil at codespeak.net Tue Mar 14 19:14:03 2006 From: mihxil at codespeak.net (mihxil@codespeak.net) Date: Tue Mar 14 19:14:04 2006 Subject: [kupu-checkins] r24367 - kupu/trunk/kupu/mmbase Message-ID: <20060314181403.1715A10094@code0.codespeak.net> Author: mihxil Date: Tue Mar 14 19:14:01 2006 New Revision: 24367 Modified: kupu/trunk/kupu/mmbase/mmbase.css Log: styled a bit better Modified: kupu/trunk/kupu/mmbase/mmbase.css ============================================================================== --- kupu/trunk/kupu/mmbase/mmbase.css (original) +++ kupu/trunk/kupu/mmbase/mmbase.css Tue Mar 14 19:14:01 2006 @@ -87,6 +87,23 @@ display: none; background-color: white; } +#kupu div.kupu-drawer textarea, #kupu div.kupu-drawer input { + border: 1px solid; + background-color: #eee; +} +#kupu div.kupu-drawer textarea { + width: 95%; +} +#kupu div#image_alt_div { + display: none; +} +#kupu div.kupu-drawer input#kupu-upload-file { + width: 60%; +} +#kupu div.kupu-drawer div.overflow { + overflow-x: auto; + overflow-y: auto; +} #kupu div.kupu-editorframe { background-color: #ccc; From mihxil at codespeak.net Wed Mar 15 00:19:52 2006 From: mihxil at codespeak.net (mihxil@codespeak.net) Date: Wed Mar 15 00:19:55 2006 Subject: [kupu-checkins] r24373 - kupu/trunk/kupu/mmbase Message-ID: <20060314231952.468CB10092@code0.codespeak.net> Author: mihxil Date: Wed Mar 15 00:19:51 2006 New Revision: 24373 Modified: kupu/trunk/kupu/mmbase/body.kupu Log: protected agains empty origin, changed format of wizard a bit Modified: kupu/trunk/kupu/mmbase/body.kupu ============================================================================== --- kupu/trunk/kupu/mmbase/body.kupu (original) +++ kupu/trunk/kupu/mmbase/body.kupu Wed Mar 15 00:19:51 2006 @@ -17,16 +17,18 @@ - + ${header.referer} - Creating relation between ${origin} and ${node} - - + + Creating relation between ${origin} and ${node} + + + From mihxil at codespeak.net Wed Mar 15 15:23:28 2006 From: mihxil at codespeak.net (mihxil@codespeak.net) Date: Wed Mar 15 15:23:29 2006 Subject: [kupu-checkins] r24386 - kupu/trunk/kupu/mmbase/drawers Message-ID: <20060315142328.5DBEA10093@code0.codespeak.net> Author: mihxil Date: Wed Mar 15 15:23:26 2006 New Revision: 24386 Modified: kupu/trunk/kupu/mmbase/drawers/upload.jspx Log: anticipate some variation in the images/attachments builders Modified: kupu/trunk/kupu/mmbase/drawers/upload.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/drawers/upload.jspx (original) +++ kupu/trunk/kupu/mmbase/drawers/upload.jspx Wed Mar 15 15:23:26 2006 @@ -17,8 +17,18 @@ - - + + + + + + + + + + + + ${file.name} From fschulze at codespeak.net Mon Mar 27 16:50:28 2006 From: fschulze at codespeak.net (fschulze@codespeak.net) Date: Mon Mar 27 16:50:31 2006 Subject: [kupu-checkins] r25040 - in kupu/branch/plone-2.1: . common default doc plone plone/kupu_plone_layer python silva Message-ID: <20060327145028.CB81910077@code0.codespeak.net> Author: fschulze Date: Mon Mar 27 16:49:21 2006 New Revision: 25040 Modified: kupu/branch/plone-2.1/__init__.py kupu/branch/plone-2.1/common/kupuhelpers.js kupu/branch/plone-2.1/common/kupusaveonpart.js kupu/branch/plone-2.1/common/kupusourceedit.js kupu/branch/plone-2.1/common/kuputoolcollapser.js kupu/branch/plone-2.1/default/sourceedit.kupu kupu/branch/plone-2.1/default/toolbar.kupu kupu/branch/plone-2.1/doc/CHANGES.txt kupu/branch/plone-2.1/plone/head.kupu kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuploneinit.js kupu/branch/plone-2.1/plone/librarytool.py kupu/branch/plone-2.1/plone/plonelibrarytool.py kupu/branch/plone-2.1/plone/toolbar.kupu kupu/branch/plone-2.1/python/spellcheck.py kupu/branch/plone-2.1/silva/closed_arrow.gif kupu/branch/plone-2.1/silva/head.kupu kupu/branch/plone-2.1/silva/kupusilvainit.js kupu/branch/plone-2.1/silva/kupusilvatools.js kupu/branch/plone-2.1/silva/opened_arrow.gif kupu/branch/plone-2.1/silva/toolboxes.kupu kupu/branch/plone-2.1/silva/wire.kupu kupu/branch/plone-2.1/silva/xmlconfig.kupu kupu/branch/plone-2.1/version.txt Log: Merged changes between kupu-1.3.3 and kupu-1.3.5. Modified: kupu/branch/plone-2.1/__init__.py ============================================================================== --- kupu/branch/plone-2.1/__init__.py (original) +++ kupu/branch/plone-2.1/__init__.py Mon Mar 27 16:49:21 2006 @@ -20,10 +20,17 @@ # test for Zope2 try: - import Zope + import Zope2 as Zope have_zope2 = 1 except ImportError: have_zope2 = 0 + +if not have_zope2: + try: + import Zope + have_zope2 = 1 + except ImportError: + have_zope2 = 0 # test for CMF try: Modified: kupu/branch/plone-2.1/common/kupuhelpers.js ============================================================================== --- kupu/branch/plone-2.1/common/kupuhelpers.js (original) +++ kupu/branch/plone-2.1/common/kupuhelpers.js Mon Mar 27 16:49:21 2006 @@ -1281,6 +1281,7 @@ String.prototype.entitize = function() { var ret = this.replace(/&/g, '&'); ret = ret.replace(/"/g, '"'); + ret = ret.replace(/'/g, '''); ret = ret.replace(//g, '>'); return ret; @@ -1290,6 +1291,7 @@ var ret = this.replace(/>/g, '>'); ret = ret.replace(/</g, '<'); ret = ret.replace(/"/g, '"'); + ret = ret.replace(/'/g, "'"); ret = ret.replace(/&/g, '&'); return ret; }; Modified: kupu/branch/plone-2.1/common/kupusaveonpart.js ============================================================================== --- kupu/branch/plone-2.1/common/kupusaveonpart.js (original) +++ kupu/branch/plone-2.1/common/kupusaveonpart.js Mon Mar 27 16:49:21 2006 @@ -13,7 +13,7 @@ function saveOnPart() { /* ask the user if (s)he wants to save the document before leaving */ if (kupu.content_changed && - confirm(_('You have unsaved changes. Do you want to save before leaving the page?'))) { + confirm(_('You are leaving the editor. Do you want to save your changes?'))) { kupu.config.reload_src = 0; kupu.saveDocument(false, true); }; Modified: kupu/branch/plone-2.1/common/kupusourceedit.js ============================================================================== --- kupu/branch/plone-2.1/common/kupusourceedit.js (original) +++ kupu/branch/plone-2.1/common/kupusourceedit.js Mon Mar 27 16:49:21 2006 @@ -17,102 +17,110 @@ this.sourcemode = false; this._currently_editing = null; + // method defined inline to support closure + // XXX would be nice to have this defined on the prototype too, because + // of subclassing issues? this.getSourceArea = function() { return getFromSelector(sourceareaid); - } + }; +}; + +SourceEditTool.prototype = new KupuTool; - this.cancelSourceMode = function() { - if (this._currently_editing) { - this.switchSourceEdit(null, true); - } - } - this.updateState = this.cancelSourceMode; - - this.initialize = function(editor) { - /* attach the event handlers */ - this.editor = editor; - this._fixTabIndex(this.sourceButton); - addEventHandler(this.sourceButton, "click", this.switchSourceEdit, this); - this.editor.logMessage(_('Source edit tool initialized')); +SourceEditTool.prototype.cancelSourceMode = function() { + if (this._currently_editing) { + this.switchSourceEdit(null, true); }; - - this.switchSourceEdit = function(event, nograb) { - var kupu = this.editor; - var docobj = this._currently_editing||kupu.getDocument(); - var editorframe = docobj.getEditable(); - var sourcearea = this.getSourceArea(); - var kupudoc = docobj.getDocument(); - var sourceClass = 'kupu-sourcemode'; - - if (!this.sourcemode) { - if (window.drawertool) { - window.drawertool.closeDrawer(); - } - if (/on/i.test(kupudoc.designMode)) { - kupudoc.designMode = 'Off'; - }; - kupu._initialized = false; - - var data=''; - if(kupu.config.filtersourceedit) { - window.status = _('Cleaning up HTML...'); - var transform = kupu._filterContent(kupu.getInnerDocument().documentElement); - data = kupu.getXMLBody(transform); - data = kupu._fixupSingletons(data).replace(/<\/?body[^>]*>/g, ""); - window.status = ''; - } else { - data = kupu.getHTMLBody(); - } - sourcearea.value = data; - kupu.setClass(sourceClass); - editorframe.style.display = 'none'; - sourcearea.style.display = 'block'; - if (!nograb) { - sourcearea.focus(); - }; - this._currently_editing = docobj; - } else { - kupu.setHTMLBody(sourcearea.value); - kupu.clearClass(sourceClass); - sourcearea.style.display = 'none'; - editorframe.style.display = 'block'; - if (/off/i.test(kupudoc.designMode)) { - kupudoc.designMode = 'On'; - }; - if (!nograb) { - docobj.getWindow().focus(); - var selection = this.editor.getSelection(); - selection.collapse(); - }; +}; + +SourceEditTool.prototype.updateState = + SourceEditTool.prototype.cancelSourceMode; - kupu._initialized = true; - this._currently_editing = null; +SourceEditTool.prototype.initialize = function(editor) { + /* attach the event handlers */ + this.editor = editor; + this._fixTabIndex(this.sourceButton); + addEventHandler(this.sourceButton, "click", this.switchSourceEdit, this); + this.editor.logMessage(_('Source edit tool initialized')); +}; + +SourceEditTool.prototype.switchSourceEdit = function(event, nograb) { + var kupu = this.editor; + var docobj = this._currently_editing||kupu.getDocument(); + var editorframe = docobj.getEditable(); + var sourcearea = this.getSourceArea(); + var kupudoc = docobj.getDocument(); + var sourceClass = 'kupu-sourcemode'; + + if (!this.sourcemode) { + if (window.drawertool) { + window.drawertool.closeDrawer(); + }; + if (/on/i.test(kupudoc.designMode)) { + kupudoc.designMode = 'Off'; + }; + kupu._initialized = false; + + var data=''; + if(kupu.config.filtersourceedit) { + window.status = _('Cleaning up HTML...'); + var transform = kupu._filterContent( + kupu.getInnerDocument().documentElement); + data = kupu.getXMLBody(transform); + data = kupu._fixupSingletons(data).replace(/<\/?body[^>]*>/g, ""); + window.status = ''; + } else { + data = kupu.getHTMLBody(); + }; + sourcearea.value = data; + kupu.setClass(sourceClass); + editorframe.style.display = 'none'; + sourcearea.style.display = 'block'; + if (!nograb) { + sourcearea.focus(); + }; + this._currently_editing = docobj; + } else { + kupu.setHTMLBody(sourcearea.value); + kupu.clearClass(sourceClass); + sourcearea.style.display = 'none'; + editorframe.style.display = 'block'; + if (/off/i.test(kupudoc.designMode)) { + kupudoc.designMode = 'On'; }; - this.sourcemode = !this.sourcemode; + if (!nograb) { + docobj.getWindow().focus(); + var selection = this.editor.getSelection(); + selection.collapse(); + }; + + kupu._initialized = true; + this._currently_editing = null; + this.editor.updateState(); }; - this.enable = function() { - KupuButtonEnable(this.sourceButton); - } - this.disable = function() { - KupuButtonDisable(this.sourceButton); - } + this.sourcemode = !this.sourcemode; }; -SourceEditTool.prototype = new KupuTool; +SourceEditTool.prototype.enable = function() { + KupuButtonEnable(this.sourceButton); +}; + +SourceEditTool.prototype.disable = function() { + KupuButtonDisable(this.sourceButton); +}; function MultiSourceEditTool(sourcebuttonid, textareaprefix) { /* Source edit tool to edit document's html source */ this.sourceButton = getFromSelector(sourcebuttonid); this.textareaprefix = textareaprefix; - this.getSourceArea = function() { - var docobj = this._currently_editing||kupu.getDocument(); - var sourceareaid = this.textareaprefix + docobj.getEditable().id; - return getFromSelector(sourceareaid); - } - this._currently_editing = null; - }; MultiSourceEditTool.prototype = new SourceEditTool; + +MultiSourceEditTool.prototype.getSourceArea = function() { + var docobj = this._currently_editing||kupu.getDocument(); + var sourceareaid = this.textareaprefix + docobj.getEditable().id; + return getFromSelector(sourceareaid); +}; Modified: kupu/branch/plone-2.1/common/kuputoolcollapser.js ============================================================================== --- kupu/branch/plone-2.1/common/kuputoolcollapser.js (original) +++ kupu/branch/plone-2.1/common/kuputoolcollapser.js Mon Mar 27 16:49:21 2006 @@ -57,6 +57,9 @@ if (initial_state[child.id] === undefined || initial_state[child.id] == '0') { body.style.display = 'none'; + } else { + heading.className = 'kupu-toolbox-heading-opened'; + heading.setAttribute('title', _('click to fold')); }; // add a reference to the openhandler on the toolbox div // so any toolbox code can use that to open the toolbox if Modified: kupu/branch/plone-2.1/default/sourceedit.kupu ============================================================================== --- kupu/branch/plone-2.1/default/sourceedit.kupu (original) +++ kupu/branch/plone-2.1/default/sourceedit.kupu Mon Mar 27 16:49:21 2006 @@ -25,6 +25,7 @@ id="kupu-source-button" title="edit HTML code" i18n:attributes="title" + accesskey="h" >  Modified: kupu/branch/plone-2.1/default/toolbar.kupu ============================================================================== --- kupu/branch/plone-2.1/default/toolbar.kupu (original) +++ kupu/branch/plone-2.1/default/toolbar.kupu Mon Mar 27 16:49:21 2006 @@ -52,7 +52,7 @@ Modified: kupu/branch/plone-2.1/doc/CHANGES.txt ============================================================================== --- kupu/branch/plone-2.1/doc/CHANGES.txt (original) +++ kupu/branch/plone-2.1/doc/CHANGES.txt Mon Mar 27 16:49:21 2006 @@ -2,6 +2,20 @@ Kupu changes ============ +- 1.3.4 + + - Silva + + * Fixed some small issues in external sources support. + + * Fixed some problems with tables, table column alignment and relative + width settings should not clash anymore. + + - General + + * Zope related: changed imports so they try to import Zope2 rather than + Zope (with Zope as a fallback) to not have Zope 2.8.x issue warnings. + - 1.3.3 - Plone Modified: kupu/branch/plone-2.1/plone/head.kupu ============================================================================== --- kupu/branch/plone-2.1/plone/head.kupu (original) +++ kupu/branch/plone-2.1/plone/head.kupu Mon Mar 27 16:49:21 2006 @@ -50,6 +50,8 @@ + Modified: kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html ============================================================================== --- kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html (original) +++ kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html Mon Mar 27 16:49:21 2006 @@ -20,8 +20,8 @@ - - + + @@ -105,6 +105,7 @@ + @@ -120,7 +121,7 @@ @@ -182,7 +183,7 @@ - + + @@ -231,10 +233,10 @@ - Abbreviation + abbreviation - Acronym + acronym @@ -343,6 +345,11 @@ + + + + + Modified: kupu/branch/plone-2.1/silva/wire.kupu ============================================================================== --- kupu/branch/plone-2.1/silva/wire.kupu (original) +++ kupu/branch/plone-2.1/silva/wire.kupu Mon Mar 27 16:49:21 2006 @@ -64,7 +64,7 @@ - + Modified: kupu/branch/plone-2.1/silva/xmlconfig.kupu ============================================================================== --- kupu/branch/plone-2.1/silva/xmlconfig.kupu (original) +++ kupu/branch/plone-2.1/silva/xmlconfig.kupu Mon Mar 27 16:49:21 2006 @@ -10,7 +10,7 @@ .. 0 1 - 1 + 0 application/xhtml+xml 1 Modified: kupu/branch/plone-2.1/version.txt ============================================================================== --- kupu/branch/plone-2.1/version.txt (original) +++ kupu/branch/plone-2.1/version.txt Mon Mar 27 16:49:21 2006 @@ -1 +1 @@ -kupu 1.3.3 +kupu 1.3.5 From fschulze at codespeak.net Mon Mar 27 17:29:50 2006 From: fschulze at codespeak.net (fschulze@codespeak.net) Date: Mon Mar 27 17:29:52 2006 Subject: [kupu-checkins] r25043 - in kupu/branch/plone-2.1: Extensions plone Message-ID: <20060327152950.4FC7F10097@code0.codespeak.net> Author: fschulze Date: Mon Mar 27 17:29:40 2006 New Revision: 25043 Modified: kupu/branch/plone-2.1/Extensions/Install.py kupu/branch/plone-2.1/plone/__init__.py Log: Added tests directory as skin layer, so the tests can be run inside Plone. Modified: kupu/branch/plone-2.1/Extensions/Install.py ============================================================================== --- kupu/branch/plone-2.1/Extensions/Install.py (original) +++ kupu/branch/plone-2.1/Extensions/Install.py Mon Mar 27 17:29:40 2006 @@ -63,6 +63,7 @@ """ # register the plone skin layer register_layer(self, 'plone/kupu_plone_layer', 'kupu_plone', out) + register_layer(self, 'tests', 'kupu_tests', out) # register as editor portal_props = getToolByName(self, 'portal_properties') Modified: kupu/branch/plone-2.1/plone/__init__.py ============================================================================== --- kupu/branch/plone-2.1/plone/__init__.py (original) +++ kupu/branch/plone-2.1/plone/__init__.py Mon Mar 27 17:29:40 2006 @@ -23,6 +23,7 @@ kupu_package_dir = package_home(kupu_globals) registerDirectory('plone/kupu_plone_layer', kupu_package_dir) +registerDirectory('tests', kupu_package_dir) def initialize(context): utils.ToolInit("kupu Library Tool", From mihxil at codespeak.net Wed Mar 29 14:16:22 2006 From: mihxil at codespeak.net (mihxil@codespeak.net) Date: Wed Mar 29 14:16:22 2006 Subject: [kupu-checkins] r25101 - in kupu/trunk/kupu/mmbase: . drawers tools Message-ID: <20060329121622.23C26100A5@code0.codespeak.net> Author: mihxil Date: Wed Mar 29 14:16:20 2006 New Revision: 25101 Modified: kupu/trunk/kupu/mmbase/drawers/attachments.items.jspx kupu/trunk/kupu/mmbase/drawers/drawer.xsl.jspx kupu/trunk/kupu/mmbase/mmbasedrawers.js kupu/trunk/kupu/mmbase/mmbasetools.js kupu/trunk/kupu/mmbase/node.body.jspx kupu/trunk/kupu/mmbase/node.jspx kupu/trunk/kupu/mmbase/tools/create-subnode.jspx kupu/trunk/kupu/mmbase/tools/related.jspx kupu/trunk/kupu/mmbase/tools/tree.jspx Log: various small changes and fixes Modified: kupu/trunk/kupu/mmbase/drawers/attachments.items.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/drawers/attachments.items.jspx (original) +++ kupu/trunk/kupu/mmbase/drawers/attachments.items.jspx Wed Mar 29 14:16:20 2006 @@ -20,7 +20,9 @@ mmbase://attachments/${attachment.number} [<mm:field name="mimetype" />: <mm:field name="title" />] b - + + + Modified: kupu/trunk/kupu/mmbase/drawers/drawer.xsl.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/drawers/drawer.xsl.jspx (original) +++ kupu/trunk/kupu/mmbase/drawers/drawer.xsl.jspx Wed Mar 29 14:16:20 2006 @@ -46,13 +46,13 @@ @@ -71,15 +71,6 @@ --> - -
-
- -
- - - -
Modified: kupu/trunk/kupu/mmbase/tools/create-subnode.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/tools/create-subnode.jspx (original) +++ kupu/trunk/kupu/mmbase/tools/create-subnode.jspx Wed Mar 29 14:16:20 2006 @@ -3,7 +3,6 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" > - Modified: kupu/trunk/kupu/mmbase/tools/related.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/tools/related.jspx (original) +++ kupu/trunk/kupu/mmbase/tools/related.jspx Wed Mar 29 14:16:20 2006 @@ -16,7 +16,7 @@ - images,urls,videosources + images,urls --> - - - pol_default + ${node} + + +
From fschulze at codespeak.net Wed Mar 29 17:13:04 2006 From: fschulze at codespeak.net (fschulze@codespeak.net) Date: Wed Mar 29 17:13:06 2006 Subject: [kupu-checkins] r25114 - kupu/branch/plone-2.1/tests Message-ID: <20060329151304.D93D6100A7@code0.codespeak.net> Author: fschulze Date: Wed Mar 29 17:13:02 2006 New Revision: 25114 Modified: kupu/branch/plone-2.1/tests/test_plone.js Log: Fix wrong test setup. Modified: kupu/branch/plone-2.1/tests/test_plone.js ============================================================================== --- kupu/branch/plone-2.1/tests/test_plone.js (original) +++ kupu/branch/plone-2.1/tests/test_plone.js Wed Mar 29 17:13:02 2006 @@ -38,7 +38,7 @@ this.setUp = function() { this.base_setUp(); this.editor = new KupuEditor(this.kupudoc, {}, null); - this.ui = new PloneKupuUI('kupu-tb-styles'); + this.ui = new KupuUI('kupu-tb-styles'); this.ui.editor = this.editor; }; From fschulze at codespeak.net Wed Mar 29 17:13:58 2006 From: fschulze at codespeak.net (fschulze@codespeak.net) Date: Wed Mar 29 17:13:59 2006 Subject: [kupu-checkins] r25115 - in kupu/branch/kupu-1.3: Extensions common/kupudrawers default plone plone/kupu_plone_layer plone/kupu_plone_layer/plonekupuimages tests Message-ID: <20060329151358.6EC6A100A7@code0.codespeak.net> Author: fschulze Date: Wed Mar 29 17:13:39 2006 New Revision: 25115 Added: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/image.gif (contents, props changed) Modified: kupu/branch/kupu-1.3/Extensions/Install.py kupu/branch/kupu-1.3/common/kupudrawers/drawer.xsl kupu/branch/kupu-1.3/default/toolbar.kupu kupu/branch/kupu-1.3/plone/__init__.py kupu/branch/kupu-1.3/plone/body.kupu kupu/branch/kupu-1.3/plone/drawers.kupu kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuplone.css.dtml kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/anchor.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/bgcolor.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/bold.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/center.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/definitionlist.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/hr.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/hyperlink.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/indent.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/italic.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/left_just.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/list.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/numbered_list.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/outdent.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/redo.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/right_just.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/strikethrough.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/subscript.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/superscript.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/table.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/textcolor.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/tools.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/underline.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/undo.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/unformat.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/view-source.gif kupu/branch/kupu-1.3/plone/kupu_plone_layer/wysiwyg_support.pt kupu/branch/kupu-1.3/plone/plonelibrarytool.py kupu/branch/kupu-1.3/plone/toolbar.kupu kupu/branch/kupu-1.3/plone/wire.kupu kupu/branch/kupu-1.3/tests/test_plone.js Log: Merged changes from plone-2.1 branch. Modified: kupu/branch/kupu-1.3/Extensions/Install.py ============================================================================== --- kupu/branch/kupu-1.3/Extensions/Install.py (original) +++ kupu/branch/kupu-1.3/Extensions/Install.py Wed Mar 29 17:13:39 2006 @@ -63,6 +63,7 @@ """ # register the plone skin layer register_layer(self, 'plone/kupu_plone_layer', 'kupu_plone', out) + register_layer(self, 'tests', 'kupu_tests', out) # register as editor portal_props = getToolByName(self, 'portal_properties') Modified: kupu/branch/kupu-1.3/common/kupudrawers/drawer.xsl ============================================================================== --- kupu/branch/kupu-1.3/common/kupudrawers/drawer.xsl (original) +++ kupu/branch/kupu-1.3/common/kupudrawers/drawer.xsl Wed Mar 29 17:13:39 2006 @@ -298,7 +298,7 @@
-
Modified: kupu/branch/kupu-1.3/default/toolbar.kupu ============================================================================== --- kupu/branch/kupu-1.3/default/toolbar.kupu (original) +++ kupu/branch/kupu-1.3/default/toolbar.kupu Wed Mar 29 17:13:39 2006 @@ -52,7 +52,7 @@ Modified: kupu/branch/kupu-1.3/plone/__init__.py ============================================================================== --- kupu/branch/kupu-1.3/plone/__init__.py (original) +++ kupu/branch/kupu-1.3/plone/__init__.py Wed Mar 29 17:13:39 2006 @@ -23,6 +23,7 @@ kupu_package_dir = package_home(kupu_globals) registerDirectory('plone/kupu_plone_layer', kupu_package_dir) +registerDirectory('tests', kupu_package_dir) def initialize(context): utils.ToolInit("kupu Library Tool", Modified: kupu/branch/kupu-1.3/plone/body.kupu ============================================================================== --- kupu/branch/kupu-1.3/plone/body.kupu (original) +++ kupu/branch/kupu-1.3/plone/body.kupu Wed Mar 29 17:13:39 2006 @@ -18,7 +18,8 @@ posfactory python:base.find('/portal_factory/'); base python:posfactory > 0 and base[:posfactory+15] or base; base kupu_base_override|base;" - tal:attributes="src string:${base}/emptypage; tabindex python:tabindex+1;" + tal:attributes="src string:${base}/emptypage; + tabindex python:tabindex is not None and tabindex + 1 or None;" > + usecaptions python:field and field.default_output_type=='text/x-html-captioned'"> 1 Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuplone.css.dtml ============================================================================== --- kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuplone.css.dtml (original) +++ kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuplone.css.dtml Wed Mar 29 17:13:39 2006 @@ -11,16 +11,17 @@ /* $Id: kupuplone.css 7217 2004-11-11 13:20:56Z duncan $ */ /* - - - - - - - -*/ -/* */ +/* + * + * */ + +.kupu a { + color: &dtml-linkColor; !important; + background-color: transparent; + text-decoration: none !important; + border-bottom: 1px #cccccc solid !important; +} + div.kupu-toolboxes {display: none} @@ -138,62 +139,66 @@ .kupu-bold, -.kupu-bold-pressed {background-image: url("kupuimages/bold.gif");} +.kupu-bold-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/bold.gif");} -.kupu-forecolor {background-image: url("plonekupuimages/text-color.gif");} -.kupu-inthyperlink {background-image: url("plonekupuimages/anchor.gif");} +.kupu-forecolor {background-image: url("&dtml-portal_url;/plonekupuimages/text-color.gif");} +.kupu-inthyperlink {background-image: url("&dtml-portal_url;/plonekupuimages/hyperlink.gif");} .kupu-inthyperlink-pressed { border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;; } -.kupu-exthyperlink {background-image: url("plonekupuimages/hyperlink.gif");} +.kupu-exthyperlink {background-image: url("&dtml-portal_url;/link_icon.gif");} .kupu-exthyperlink-pressed { border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;; } -.kupu-image {background-image: url("kupuimages/image.png");} +.kupu-image {background-image: url("&dtml-portal_url;/plonekupuimages/image.gif");} -.kupu-indent {background-image: url("kupuimages/indent.gif");} -.kupu-inserthorizontalrule {background-image: url("plonekupuimages/hr.gif");} +.kupu-indent {background-image: url("&dtml-portal_url;/plonekupuimages/indent.gif");} +.kupu-inserthorizontalrule {background-image: url("&dtml-portal_url;/plonekupuimages/hr.gif");} .kupu-insertorderedlist, -.kupu-insertorderedlist-pressed {background-image: url("plonekupuimages/numbered_list.gif");} +.kupu-insertorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/numbered_list.gif");} .kupu-insertunorderedlist, -.kupu-insertunorderedlist-pressed {background-image: url("plonekupuimages/list.gif");} +.kupu-insertunorderedlist-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/list.gif");} -.kupu-insertdefinitionlist {background-image: url("plonekupuimages/definitionlist.gif");} +.kupu-insertdefinitionlist {background-image: url("&dtml-portal_url;/plonekupuimages/definitionlist.gif");} .kupu-italic, -.kupu-italic-pressed {background-image: url("kupuimages/italic.gif");} +.kupu-italic-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/italic.gif");} .kupu-justifycenter, -.kupu-justifycenter-pressed {background-image: url("plonekupuimages/center.gif");} +.kupu-justifycenter-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/center.gif");} .kupu-justifyleft, -.kupu-justifyleft-pressed {background-image: url("plonekupuimages/left_just.gif");} +.kupu-justifyleft-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/left_just.gif");} .kupu-justifyright, -.kupu-justifyright-pressed {background-image: url("plonekupuimages/right_just.gif");} +.kupu-justifyright-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/right_just.gif");} -button.kupu-logo {background-image: url("kupuimages/kupu_icon.gif");} -.kupu-outdent {background-image: url("plonekupuimages/outdent.gif");} -.kupu-redo {background-image: url("plonekupuimages/redo.gif");} -.kupu-save {background-image: url("kupuimages/save.png");} -.kupu-save-and-exit {background-image: url("kupuimages/exit.gif");} -.kupu-space {background-image: url("plonekupuimages/space.gif");} -.kupu-source {background-image: url("plonekupuimages/view-source.gif");} +button.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");} +.kupu-outdent {background-image: url("&dtml-portal_url;/plonekupuimages/outdent.gif");} +.kupu-redo {background-image: url("&dtml-portal_url;/plonekupuimages/redo.gif");} +.kupu-save {background-image: url("&dtml-portal_url;/plonekupuimages/save.png");} +.kupu-save-and-exit {background-image: url("&dtml-portal_url;/kupuimages/exit.gif");} +.kupu-space {background-image: url("&dtml-portal_url;/plonekupuimages/space.gif");} +.kupu-source {background-image: url("&dtml-portal_url;/plonekupuimages/view-source.gif");} .kupu-subscript, -.kupu-subscript-pressed {background-image: url("plonekupuimages/subscript.gif");} +.kupu-subscript-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/subscript.gif");} .kupu-superscript, -.kupu-superscript-pressed {background-image: url("plonekupuimages/superscript.gif");} +.kupu-superscript-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/superscript.gif");} -.kupu-table {background-image: url("plonekupuimages/table.gif");} +.kupu-table {background-image: url("&dtml-portal_url;/plonekupuimages/table.gif");} .kupu-underline, -.kupu-underline-pressed {background-image: url("kupuimages/underline.gif");} +.kupu-underline-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/underline.gif");} + +.kupu-undo {background-image: url("&dtml-portal_url;/plonekupuimages/undo.gif");} +.kupu-removelink {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");} +.kupu-removeimage {background-image: url("&dtml-portal_url;/plonekupuimages/delete_icon.gif");} + +.kupu-zoom {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreenexpand_icon.gif");} +.kupu-zoom-pressed {background-image: url("&dtml-portal_url;/plonekupuimages/fullscreencollapse_icon.gif");} -.kupu-undo {background-image: url("plonekupuimages/undo.gif");} -.kupu-removelink {background-image: url("plonekupuimages/delete_icon.gif");} -.kupu-removeimage {background-image: url("plonekupuimages/delete_icon.gif");} div.kupu-drawer { border: solid 1px &dtml-contentViewBorderColor;; @@ -236,5 +241,9 @@ border: &dtml-borderWidth; solid &dtml-globalBorderColor;; background-color: white; } -/* */ +#kupu-logo-button { + display: none; +} + +/* */ Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/anchor.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/bgcolor.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/bold.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/center.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/definitionlist.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/hr.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/hyperlink.gif ============================================================================== Binary files. No diff available. Added: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/image.gif ============================================================================== Binary file. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/indent.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/italic.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/left_just.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/list.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/numbered_list.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/outdent.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/redo.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/right_just.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/strikethrough.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/subscript.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/superscript.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/table.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/textcolor.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/tools.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/underline.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/undo.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/unformat.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/plonekupuimages/view-source.gif ============================================================================== Binary files. No diff available. Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/wysiwyg_support.pt ============================================================================== --- kupu/branch/kupu-1.3/plone/kupu_plone_layer/wysiwyg_support.pt (original) +++ kupu/branch/kupu-1.3/plone/kupu_plone_layer/wysiwyg_support.pt Wed Mar 29 17:13:39 2006 @@ -6,7 +6,7 @@ +> @@ -17,7 +17,7 @@ +> Modified: kupu/branch/kupu-1.3/plone/plonelibrarytool.py ============================================================================== --- kupu/branch/kupu-1.3/plone/plonelibrarytool.py (original) +++ kupu/branch/kupu-1.3/plone/plonelibrarytool.py Wed Mar 29 17:13:39 2006 @@ -70,9 +70,12 @@ _style_whitelist = ['text-align', 'list-style-type', 'float'] _default_paragraph_styles = ( - "Heading|h2|Heading", - "Subheading|h3|Subheading", - "Formatted|pre", + "Heading|h2", + "Subheading|h3", + "Literal|pre", + "Discreet|p|discreet", + "Pull-quote|blockquote|pullquote", + "Call-out|p|callout" ) class PloneKupuLibraryTool(UniqueObject, SimpleItem, KupuLibraryTool): Modified: kupu/branch/kupu-1.3/plone/toolbar.kupu ============================================================================== --- kupu/branch/kupu-1.3/plone/toolbar.kupu (original) +++ kupu/branch/kupu-1.3/plone/toolbar.kupu Wed Mar 29 17:13:39 2006 @@ -10,9 +10,9 @@ Modified: kupu/branch/kupu-1.3/plone/wire.kupu ============================================================================== --- kupu/branch/kupu-1.3/plone/wire.kupu (original) +++ kupu/branch/kupu-1.3/plone/wire.kupu Wed Mar 29 17:13:39 2006 @@ -44,4 +44,25 @@ + + + + + + + + + + + + + + + + + + + + + Modified: kupu/branch/kupu-1.3/tests/test_plone.js ============================================================================== --- kupu/branch/kupu-1.3/tests/test_plone.js (original) +++ kupu/branch/kupu-1.3/tests/test_plone.js Wed Mar 29 17:13:39 2006 @@ -38,7 +38,7 @@ this.setUp = function() { this.base_setUp(); this.editor = new KupuEditor(this.kupudoc, {}, null); - this.ui = new PloneKupuUI('kupu-tb-styles'); + this.ui = new KupuUI('kupu-tb-styles'); this.ui.editor = this.editor; }; From guido at codespeak.net Thu Mar 30 18:28:38 2006 From: guido at codespeak.net (guido@codespeak.net) Date: Thu Mar 30 18:28:40 2006 Subject: [kupu-checkins] r25147 - kupu/branch/kupu-1.3/silva Message-ID: <20060330162838.C53BA100D1@code0.codespeak.net> Author: guido Date: Thu Mar 30 18:28:36 2006 New Revision: 25147 Modified: kupu/branch/kupu-1.3/silva/kupusilvatools.js Log: Added some nasty hacks to allow multi-value fields to work in code sources, for this the list values need to be serialized and deserialized (using eval and repr to do that currently) and code needs to find out whether a value is a list or not (which is done in different ways depending on the environment in which the code is executed). Modified: kupu/branch/kupu-1.3/silva/kupusilvatools.js ============================================================================== --- kupu/branch/kupu-1.3/silva/kupusilvatools.js (original) +++ kupu/branch/kupu-1.3/silva/kupusilvatools.js Thu Mar 30 18:28:36 2006 @@ -2110,6 +2110,10 @@ SilvaExternalSourceTool.prototype._addFormToTool = function(object) { if (this.readyState == 4) { if (this.status != '200') { + if (this.status == '500') { + alert('error on the server. body returned:\n' + + this.responseText); + }; // element not found, return without doing anythink object.resetTool(); return; @@ -2138,7 +2142,8 @@ }; }; -SilvaExternalSourceTool.prototype._addExternalSourceIfValidated = function(object) { +SilvaExternalSourceTool.prototype._addExternalSourceIfValidated = + function(object) { if (this.readyState == 4) { if (this.status == '200') { // success, add the external source element to the document @@ -2152,7 +2157,8 @@ extsource.appendChild(header); extsource.className = 'externalsource'; var metatype = 'Silva Code Source'; // a default just in case - for (var i=0; i < this.responseXML.documentElement.childNodes.length; i++) { + for (var i=0; i < + this.responseXML.documentElement.childNodes.length; i++) { var child = this.responseXML.documentElement.childNodes[i]; if (child.nodeName.toLowerCase() == 'parameter') { var key = child.getAttribute('key'); @@ -2164,9 +2170,16 @@ metatype = value; continue; }; - extsource.setAttribute(key, value); + // for presentation only change some stuff + var displayvalue = value.toString(); + var attrkey = key; + if (child.getAttribute('type') == 'list') { + displayvalue = eval(value).join(', '); + attrkey = key + '__type__list'; + }; + extsource.setAttribute(attrkey, value); key = key.replace(/_/g, ' '); - var textel = doc.createTextNode(key + ': ' + value.toString()); + var textel = doc.createTextNode(key + ': ' + displayvalue); extsource.appendChild(textel); extsource.appendChild(doc.createElement('br')); }; @@ -2267,15 +2280,15 @@ } else { var value = new Array(); for (var i=0; i < child.options.length; i++) { - if (child.options[i].checked) { - value.push(options[i].value); - }; - if (value.length > 1) { - data[name] = value; - } else if (value.length) { - data[name] = value[0]; + if (child.options[i].selected) { + value.push(child.options[i].value); }; }; + if (value.length > 1) { + data[name] = value; + } else if (value.length) { + data[name] = value[0]; + }; }; }; }; @@ -2284,10 +2297,16 @@ var ret = new Array(); for (var key in data) { var value = data[key]; - // XXX does IE5 support encodeURIComponent? - ret.push(encodeURIComponent(key) + '=' + encodeURIComponent(value)); + if (!(value instanceof Array)) { + value = [value]; + }; + for (var i=0; i < value.length; i++) { + // XXX does IE5 support encodeURIComponent? + ret.push(encodeURIComponent(key) + '=' + + encodeURIComponent(value[i])); + }; }; - + return ret.join("&"); }; From mihxil at codespeak.net Thu Mar 30 19:32:19 2006 From: mihxil at codespeak.net (mihxil@codespeak.net) Date: Thu Mar 30 19:32:20 2006 Subject: [kupu-checkins] r25149 - kupu/trunk/kupu/mmbase Message-ID: <20060330173219.C5B56100D1@code0.codespeak.net> Author: mihxil Date: Thu Mar 30 19:32:19 2006 New Revision: 25149 Modified: kupu/trunk/kupu/mmbase/body.kupu Log: was using a dirty trick to determin what type of node it had to create. Now it besides this dirty trick, also tries a less dirty trick. Modified: kupu/trunk/kupu/mmbase/body.kupu ============================================================================== --- kupu/trunk/kupu/mmbase/body.kupu (original) +++ kupu/trunk/kupu/mmbase/body.kupu Thu Mar 30 19:32:19 2006 @@ -17,10 +17,25 @@ - ${header.referer} - + ${header.referer} + ${mm:directory(referrer)}/${param.wizard}.xml + + + + + + + + + + + + + ${wizard[fn:length(wizard) - 1]} + + From limi at codespeak.net Fri Mar 31 03:19:08 2006 From: limi at codespeak.net (limi@codespeak.net) Date: Fri Mar 31 03:19:11 2006 Subject: [kupu-checkins] r25170 - in kupu/branch/plone-2.1/plone: . kupu_plone_layer Message-ID: <20060331011908.EFF7A100D6@code0.codespeak.net> Author: limi Date: Fri Mar 31 03:19:01 2006 New Revision: 25170 Modified: kupu/branch/plone-2.1/plone/body.kupu kupu/branch/plone-2.1/plone/kupu_plone_layer/kupu_wysiwyg_support.html kupu/branch/plone-2.1/plone/kupu_plone_layer/kupuplone.css.dtml Log: Removing text format selector when using Kupu, changed text to "edit using visual editor" (users don't know what Kupu is, nor should they need to). Tabs->spaces cleanup. Modified: kupu/branch/plone-2.1/plone/body.kupu ============================================================================== --- kupu/branch/plone-2.1/plone/body.kupu (original) +++ kupu/branch/plone-2.1/plone/body.kupu Fri Mar 31 03:19:01 2006 @@ -4,12 +4,10 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:kupu="http://kupu.oscom.org/namespaces/dist" xmlns:tal="http://xml.zope.org/namespaces/tal" - xmlns:i18n="http://xml.zope.org/namespaces/i18n" - > + xmlns:i18n="http://xml.zope.org/namespaces/i18n"> $Id$ - + tal:attributes="tabindex python:tabindex is not None and tabindex + 1 or None;">  From guido at codespeak.net Fri Mar 31 16:00:19 2006 From: guido at codespeak.net (guido@codespeak.net) Date: Fri Mar 31 16:00:21 2006 Subject: [kupu-checkins] r25187 - kupu/branch/kupu-1.3/doc Message-ID: <20060331140019.E8583100D6@code0.codespeak.net> Author: guido Date: Fri Mar 31 16:00:19 2006 New Revision: 25187 Modified: kupu/branch/kupu-1.3/doc/CHANGES.txt Log: Added note about latest fixes. Modified: kupu/branch/kupu-1.3/doc/CHANGES.txt ============================================================================== --- kupu/branch/kupu-1.3/doc/CHANGES.txt (original) +++ kupu/branch/kupu-1.3/doc/CHANGES.txt Fri Mar 31 16:00:19 2006 @@ -2,6 +2,12 @@ Kupu changes ============ +- 1.3.5 + + - Silva + + * Fixed multi-value form element support in ExternalSource tool. + - 1.3.4 - Silva From fschulze at codespeak.net Fri Mar 31 16:48:43 2006 From: fschulze at codespeak.net (fschulze@codespeak.net) Date: Fri Mar 31 16:48:44 2006 Subject: [kupu-checkins] r25188 - in kupu/branch/plone-2.1/common: . kupudrawers Message-ID: <20060331144843.B9E89100D6@code0.codespeak.net> Author: fschulze Date: Fri Mar 31 16:48:42 2006 New Revision: 25188 Modified: kupu/branch/plone-2.1/common/kupudrawers.js kupu/branch/plone-2.1/common/kupudrawers/drawer.xsl Log: Added optional image size selector. Use the following syntax in collections: [url to the image of this size] Modified: kupu/branch/plone-2.1/common/kupudrawers.js ============================================================================== --- kupu/branch/plone-2.1/common/kupudrawers.js (original) +++ kupu/branch/plone-2.1/common/kupudrawers.js Fri Mar 31 16:48:42 2006 @@ -937,7 +937,13 @@ return; }; - var uri = selnode.selectSingleNode('uri/text()').nodeValue; + var sizeselector = document.getElementsByName('image-size-selector'); + if (sizeselector && sizeselector.length > 0) { + sizeselector = sizeselector[0]; + var uri = sizeselector.options[sizeselector.selectedIndex].value; + } else { + var uri = selnode.selectSingleNode('uri/text()').nodeValue; + } uri = uri.strip(); // needs kupuhelpers.js var alt = getFromSelector('image_alt').value; Modified: kupu/branch/plone-2.1/common/kupudrawers/drawer.xsl ============================================================================== --- kupu/branch/plone-2.1/common/kupudrawers/drawer.xsl (original) +++ kupu/branch/plone-2.1/common/kupudrawers/drawer.xsl Fri Mar 31 16:48:42 2006 @@ -241,9 +241,20 @@ id="image-caption" checked="checked"/> + + + + + +