From hannosch at codespeak.net  Sun Apr  1 19:31:57 2007
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Sun,  1 Apr 2007 19:31:57 +0200 (CEST)
Subject: [kupu-checkins] r41772 - kupu/trunk/kupu/plone
Message-ID: <20070401173157.7CCBB1007C@code0.codespeak.net>

Author: hannosch
Date: Sun Apr  1 19:31:55 2007
New Revision: 41772

Modified:
   kupu/trunk/kupu/plone/util.py
Log:
Remove print statement.


Modified: kupu/trunk/kupu/plone/util.py
==============================================================================
--- kupu/trunk/kupu/plone/util.py	(original)
+++ kupu/trunk/kupu/plone/util.py	Sun Apr  1 19:31:55 2007
@@ -46,7 +46,7 @@
         mod = __import__(module, globals(), locals(), [interface])
         if hasattr(mod, interface):
             iname_mapping[id] = getattr(mod, interface)
-    print iname_mapping
+
 
 security.declarePublic('getToolByName')
 def getToolByName(context, tool_name, default=None):

From nouri at codespeak.net  Sun Apr  1 20:27:36 2007
From: nouri at codespeak.net (nouri at codespeak.net)
Date: Sun,  1 Apr 2007 20:27:36 +0200 (CEST)
Subject: [kupu-checkins] r41774 - kupu/trunk/kupu/plone/profiles/default
Message-ID: <20070401182736.70ED11007C@code0.codespeak.net>

Author: nouri
Date: Sun Apr  1 20:27:34 2007
New Revision: 41774

Modified:
   kupu/trunk/kupu/plone/profiles/default/skins.xml
Log:
Install the kupu layer after custom.


Modified: kupu/trunk/kupu/plone/profiles/default/skins.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/skins.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/skins.xml	Sun Apr  1 20:27:34 2007
@@ -9,7 +9,7 @@
  <object name="kupu_tests" meta_type="Filesystem Directory View"
     directory="kupu/tests"/>
  <skin-path name="*">
-  <layer name="kupu" insert-before="*"/>
+  <layer name="kupu" insert-after="custom"/>
   <layer name="kupu_plone" insert-before="kupu"/>
   <layer name="kupu_tests" insert-after="kupu"/>
  </skin-path>

From duncan at codespeak.net  Tue Apr  3 10:36:12 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue,  3 Apr 2007 10:36:12 +0200 (CEST)
Subject: [kupu-checkins] r41836 - in kupu/trunk/kupu: common default doc
Message-ID: <20070403083612.03A5B10077@code0.codespeak.net>

Author: duncan
Date: Tue Apr  3 10:36:10 2007
New Revision: 41836

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
Make ToC numbering optional

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Tue Apr  3 10:36:10 2007
@@ -1425,6 +1425,7 @@
         this.style1 = getFromSelector('kupu-bm-sel1');
         this.style2 = getFromSelector('kupu-bm-sel2');
         this.ostyle = getFromSelector('kupu-bm-outcls');
+        this.nstyle = getFromSelector('kupu-bm-number');
         this.radio1 = getFromSelector('kupu-ins-bm');
         this.radio2 = getFromSelector('kupu-toc');
         this.paralist = getBaseTagClass(this.element, 'div', 'kupu-bm-paras');
@@ -1532,7 +1533,7 @@
                     };
                     var li = ed.newElement('li', {'className': 'level'+level},
                         [ed.newElement('a', {'href': '#'+a},
-                        [ed.newText(number + ' ' + caption)])]);
+                        [ed.newText((this.nstyle.checked?number + ' ':'') + caption)])]);
 
                     if (level==0) {
                         toc.appendChild(li);

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Tue Apr  3 10:36:10 2007
@@ -268,6 +268,12 @@
                     <option value="" i18n:translate="">Normal</option>
                   </select>
                 </div>
+                <div style="float:right">
+                  <label i18n:translate="" for="kupu-bm-number">
+                    Numbering
+                  </label>
+                  <input type="checkbox" checked="checked" id="kupu-bm-number"/>
+                </div>
                 <label for="kupu-bm-checkall">
                   <em i18n:translate="">toggle all</em>
                 </label>

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Tue Apr  3 10:36:10 2007
@@ -2,8 +2,19 @@
 Kupu changes
 ============
 
+- latest
   - Adjusted some more Plone tests to work on Plone 3.0.
 
+  - Kupu is automatically suppressed when the content being edited
+    starts with an html comment (<!--).
+
+  - getToolByName directed through a local kupu implementation in an
+    attempt to suppress CMFCore deprecation warning. (This is the wrong
+    way round, we should really call queryUtility everywhere in kupu and
+    have the mapping fallback to getToolByName, but it should do for now)
+
+  - Table of contents numbering is now optional.
+
 - 1.4 Beta 4
 
   - Adjusted some Plone tests to work on Plone 3.0.

From duncan at codespeak.net  Thu Apr  5 13:36:04 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu,  5 Apr 2007 13:36:04 +0200 (CEST)
Subject: [kupu-checkins] r41908 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070405113604.04E8E10081@code0.codespeak.net>

Author: duncan
Date: Thu Apr  5 13:36:02 2007
New Revision: 41908

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
Log:
Typo in path for getToolByName replacement.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	Thu Apr  5 13:36:02 2007
@@ -10,7 +10,7 @@
     >
 
 <tal:with define="
-    getToolByName nocall:modules/Products/kupu/util/getToolByName;
+    getToolByName nocall:modules/Products/kupu/plone/util/getToolByName;
     kupu_tool     python:getToolByName(context, 'kupu_library_tool');
     libraries     python:kupu_tool.getCookedLibraries(context);
     ">

From limi at codespeak.net  Sun Apr  8 22:53:01 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Sun,  8 Apr 2007 22:53:01 +0200 (CEST)
Subject: [kupu-checkins] r41972 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070408205301.6347510053@code0.codespeak.net>

Author: limi
Date: Sun Apr  8 22:52:59 2007
New Revision: 41972

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
Log:
Adding the region-content ID, so content styling behaves as expected.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	Sun Apr  8 22:52:59 2007
@@ -21,7 +21,7 @@
           tail python:test(folderish, '/', '');"
         tal:attributes="href string:${request/URL1}${tail}" />
   </head>
-  <body class="kupu documentContent">
+  <body class="kupu documentContent" id="region-content">
 
    <tal:comment replace="nothing">    
       This template is an empty placeholder, used for loading contents

From duncan at codespeak.net  Fri Apr 13 13:30:24 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Fri, 13 Apr 2007 13:30:24 +0200 (CEST)
Subject: [kupu-checkins] r42025 - in kupu/trunk/kupu/plone: . tests
Message-ID: <20070413113024.07D5580BB@code0.codespeak.net>

Author: duncan
Date: Fri Apr 13 13:30:24 2007
New Revision: 42025

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
Log:
HTML allows spaces round the = in an attribute.

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Fri Apr 13 13:30:24 2007
@@ -25,7 +25,7 @@
 # IMAGE_PATTERN matches an image tag on its own, or an image tag
 # enclosed in a simple <p> or <div>. In the latter case we strip out
 # the enclosing tag since we are going to insert our own.
-PATIMG = '\\<img[^>]+class=[^=>]*captioned[^>]+\\>'
+PATIMG = '\\<img[^>]+class\s*=[^=>]*captioned[^>]+\\>'
 PATA = '(?:\\<a[^>]*\\>'+PATIMG+'\\</a\\>)' + '|' + PATIMG
 PAT0 = '('+PATA+')'
 PAT1 = '<(?:p|div)[^>]*>'+PAT0 + '</(?:p|div)>' + '|' + PAT0
@@ -41,15 +41,15 @@
 ATTR_PATTERN = re.compile('''
     (?P<tag>\<
      ( class%s
-     | src="resolveuid/(?P<src>([^/"#? ]*))
+     | src\s*=\s*"resolveuid/(?P<src>([^/"#? ]*))
      | width%s
      | .
      )*\>
     )''' % (ATTR_CLASS, ATTR_WIDTH), re.VERBOSE | re.IGNORECASE | re.DOTALL)
 SRC_TAIL = re.compile(r'/([^" \/>]+)')
 
-CLASS_PATTERN = re.compile('\s*class=("[^"]*captioned[^"]*"|[^" \/>]+)')
-ALT_PATTERN = re.compile('\\balt=("[^"]*"|[^" \/>]+)')
+CLASS_PATTERN = re.compile('\s*class\s*=\s*("[^"]*captioned[^"]*"|[^" \/>]+)')
+ALT_PATTERN = re.compile('\\balt\s*=\s*("[^"]*"|[^" \/>]+)')
 END_TAG_PATTERN = re.compile('(<img[^>]*?)( */?>)')
 IMAGE_TEMPLATE = '''\
 <div class="%(class)s" style="width:%(width)spx;">
@@ -62,7 +62,7 @@
 </div>
 '''
 
-UID_PATTERN = re.compile('(?P<tag><(?:a|img)\\s[^>]*(?:src|href)=")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))', re.DOTALL | re.IGNORECASE)
+UID_PATTERN = re.compile('(?P<tag><(?:a|img)\\s[^>]*(?:src|href)\s*=\s*")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))', re.DOTALL | re.IGNORECASE)
 
 class HTMLToCaptioned:
     """Transform which adds captions to images embedded in HTML"""
@@ -189,7 +189,7 @@
 
 ATTR_HREF = ATTR_VALUE % 'href'
 LINK_PATTERN = re.compile(
-    r'(?P<prefix>\<(?:img\s[^>]*src|a\s[^>]*href)=(?:"?))(?P<href>(?<=")[^"]*|[^ \/>]*)',
+    r'(?P<prefix>\<(?:img\s[^>]*src|a\s[^>]*href)\s*=\s*(?:"?))(?P<href>(?<=")[^"]*|[^ \/>]*)',
     re.IGNORECASE)
 FRAGMENT_TYPE = 'CompositePack Fragments'
 NAVIGATION_PAGE = 'Navigation Page'

Modified: kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_browserSupportsKupu.py	Fri Apr 13 13:30:24 2007
@@ -17,9 +17,19 @@
 if __name__ == '__main__':
     execfile(os.path.join(sys.path[0], 'framework.py'))
 
+from Testing import ZopeTestCase
+DEPS = ('MimetypesRegistry', 'PortalTransforms', 'Archetypes', 'ATContentTypes')
+try:
+    import Products.TextIndexNG2
+    DEPS = DEPS + ('TextIndexNG2',)
+except ImportError:
+    pass
+
+for product in DEPS:
+    ZopeTestCase.installProduct(product, 1)
 from Products.PloneTestCase import PloneTestCase
 
-PloneTestCase.setupPloneSite(products=['kupu'])
+PloneTestCase.setupPloneSite(products=['ATContentTypes', 'kupu'])
 
 class TestBrowserSupportsKupu(PloneTestCase.PloneTestCase):
 

From duncan at codespeak.net  Mon Apr 16 17:44:48 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 16 Apr 2007 17:44:48 +0200 (CEST)
Subject: [kupu-checkins] r42099 - in kupu/trunk/kupu: common
	plone/kupu_plone_layer
Message-ID: <20070416154448.34DDF80C8@code0.codespeak.net>

Author: duncan
Date: Mon Apr 16 17:44:47 2007
New Revision: 42099

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
   kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
Log:
kupucontentfilters.js, don't strip <br> tag from inside things other than <p> or <div> (e.g. inside <strong> it should be preserved).
Fix import of getToolByName in kupulibraries.xml

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Mon Apr 16 17:44:47 2007
@@ -556,7 +556,7 @@
                 parentNode.appendChild(p);
                 return false;
             }
-            if (!node.nextSibling) return false;
+            if (!node.nextSibling && parentNode.nodeName.test(/p|div/)) return false;
             return true;
         };
     }

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	Mon Apr 16 17:44:47 2007
@@ -10,7 +10,7 @@
     >
 
 <tal:with define="
-    getToolByName nocall:modules/Products/kupu/plone/util/getToolByName;
+    getToolByName nocall:modules/Products.kupu.plone.util/getToolByName;
     kupu_tool     python:getToolByName(context, 'kupu_library_tool');
     libraries     python:kupu_tool.getCookedLibraries(context);
     ">

From duncan at codespeak.net  Tue Apr 17 09:17:49 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 17 Apr 2007 09:17:49 +0200 (CEST)
Subject: [kupu-checkins] r42114 - in kupu/trunk/kupu/plone: .
	profiles/default
Message-ID: <20070417071749.1C37B80D7@code0.codespeak.net>

Author: duncan
Date: Tue Apr 17 09:17:48 2007
New Revision: 42114

Modified:
   kupu/trunk/kupu/plone/helpers.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
Log:
Disable undo/redo and sub/superscript buttons by default.

Modified: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- kupu/trunk/kupu/plone/helpers.py	(original)
+++ kupu/trunk/kupu/plone/helpers.py	Tue Apr 17 09:17:48 2007
@@ -14,9 +14,9 @@
     ('bg-basicmarkup', 'Bold/Italic group', True, None),
     ('bold-button', 'Bold button', True, 'kupu-bold'),
     ('italic-button', 'Italic button', True, 'kupu-italic'),
-    ('bg-subsuper', 'Subscript/Superscript group', True, None),
-    ('subscript-button', 'Subscript button', True, 'kupu-subscript'),
-    ('superscript-button', 'Superscript button', True, 'kupu-superscript'),
+    ('bg-subsuper', 'Subscript/Superscript group', False, None),
+    ('subscript-button', 'Subscript button', False, 'kupu-subscript'),
+    ('superscript-button', 'Superscript button', False, 'kupu-superscript'),
     ('bg-colorchooser', 'Colour chooser group', False, None),
     ('forecolor-button', 'Psychedelic foreground', False, 'kupu-forecolor'),
     ('hilitecolor-button', 'Psychedelic background', False, 'kupu-hilitecolor'),
@@ -40,9 +40,9 @@
     ('bg-remove', 'Remove group', True, None),
     ('removeimage-button', 'Remove image button', True, 'kupu-removeimage'),
     ('removelink-button', 'Remove link button', True, 'kupu-removelink'),
-    ('bg-undo', 'Undo group', True, None),
-    ('undo-button', 'Undo button', True, 'kupu-undo'),
-    ('redo-button', 'Redo button', True, 'kupu-redo'),
+    ('bg-undo', 'Undo group', False, None),
+    ('undo-button', 'Undo button', False, 'kupu-undo'),
+    ('redo-button', 'Redo button', False, 'kupu-redo'),
     ('spellchecker', 'Spellchecker', False, 'kupu-spellchecker'),
     ('source', 'Source', True, 'kupu-source'),
     ('styles', 'Styles pulldown', True, None),

Modified: kupu/trunk/kupu/plone/profiles/default/kupu.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/kupu.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/kupu.xml	Tue Apr 17 09:17:48 2007
@@ -123,9 +123,9 @@
     <element visible="True" id="bg-basicmarkup"/>
     <element visible="True" id="bold-button"/>
     <element visible="True" id="italic-button"/>
-    <element visible="True" id="bg-subsuper"/>
-    <element visible="True" id="subscript-button"/>
-    <element visible="True" id="superscript-button"/>
+    <element visible="False" id="bg-subsuper"/>
+    <element visible="False" id="subscript-button"/>
+    <element visible="False" id="superscript-button"/>
     <element visible="False" id="bg-colorchooser"/>
     <element visible="False" id="forecolor-button"/>
     <element visible="False" id="hilitecolor-button"/>
@@ -149,9 +149,9 @@
     <element visible="True" id="bg-remove"/>
     <element visible="True" id="removeimage-button"/>
     <element visible="True" id="removelink-button"/>
-    <element visible="True" id="bg-undo"/>
-    <element visible="True" id="undo-button"/>
-    <element visible="True" id="redo-button"/>
+    <element visible="False" id="bg-undo"/>
+    <element visible="False" id="undo-button"/>
+    <element visible="False" id="redo-button"/>
     <element visible="False" id="spellchecker"/>
     <element visible="True" id="source"/>
     <element visible="True" id="styles"/>

From duncan at codespeak.net  Tue Apr 17 15:54:07 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 17 Apr 2007 15:54:07 +0200 (CEST)
Subject: [kupu-checkins] r42126 - in kupu/trunk/kupu/plone: .
	profiles/default
Message-ID: <20070417135407.57BE580A3@code0.codespeak.net>

Author: duncan
Date: Tue Apr 17 15:54:07 2007
New Revision: 42126

Modified:
   kupu/trunk/kupu/plone/helpers.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
   kupu/trunk/kupu/plone/resource_types.pt
Log:
Disable unordered list pulldown.

Modified: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- kupu/trunk/kupu/plone/helpers.py	(original)
+++ kupu/trunk/kupu/plone/helpers.py	Tue Apr 17 15:54:07 2007
@@ -46,7 +46,7 @@
     ('spellchecker', 'Spellchecker', False, 'kupu-spellchecker'),
     ('source', 'Source', True, 'kupu-source'),
     ('styles', 'Styles pulldown', True, None),
-    ('ulstyles', 'Unordered list style pulldown', True, None),
+    ('ulstyles', 'Unordered list style pulldown', False, None),
     ('olstyles', 'Ordered list style pulldown', True, None),
     ('zoom', 'Zoom button', True, 'kupu-zoom'),
 ]

Modified: kupu/trunk/kupu/plone/profiles/default/kupu.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/kupu.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/kupu.xml	Tue Apr 17 15:54:07 2007
@@ -155,7 +155,7 @@
     <element visible="False" id="spellchecker"/>
     <element visible="True" id="source"/>
     <element visible="True" id="styles"/>
-    <element visible="True" id="ulstyles"/>
+    <element visible="False" id="ulstyles"/>
     <element visible="True" id="olstyles"/>
     <element visible="True" id="zoom"/>
   </toolbar>

Modified: kupu/trunk/kupu/plone/resource_types.pt
==============================================================================
--- kupu/trunk/kupu/plone/resource_types.pt	(original)
+++ kupu/trunk/kupu/plone/resource_types.pt	Tue Apr 17 15:54:07 2007
@@ -168,7 +168,7 @@
     </td>
   </tr>
   <tr>
-    <td style="border-right: none;" width="1%">Normal Image</td>
+    <td style="border-right: none;" width="1%">Normal&nbsp;mage</td>
     <td>
       <input type="text" name="preview_action.normal:records"
              style="width:90%"

From duncan at codespeak.net  Tue Apr 17 16:41:43 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 17 Apr 2007 16:41:43 +0200 (CEST)
Subject: [kupu-checkins] r42128 - kupu/trunk/kupu/doc
Message-ID: <20070417144143.0781380A3@code0.codespeak.net>

Author: duncan
Date: Tue Apr 17 16:41:43 2007
New Revision: 42128

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
Update CHANGES.txt for beta 5

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Tue Apr 17 16:41:43 2007
@@ -2,7 +2,8 @@
 Kupu changes
 ============
 
-- latest
+- 1.4 Beta 5
+
   - Adjusted some more Plone tests to work on Plone 3.0.
 
   - Kupu is automatically suppressed when the content being edited
@@ -15,6 +16,10 @@
 
   - Table of contents numbering is now optional.
 
+  - Disabled undo/redo, sub/superscript and unordered list buttons
+
+  - Link checker now recognises attributes with whitespace round '='.
+
 - 1.4 Beta 4
 
   - Adjusted some Plone tests to work on Plone 3.0.

From duncan at codespeak.net  Tue Apr 17 17:05:38 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Tue, 17 Apr 2007 17:05:38 +0200 (CEST)
Subject: [kupu-checkins] r42129 - kupu/trunk/kupu/common
Message-ID: <20070417150538.34E7E80A3@code0.codespeak.net>

Author: duncan
Date: Tue Apr 17 17:05:37 2007
New Revision: 42129

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
Log:
Fix error in cleanup code.

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Tue Apr 17 17:05:37 2007
@@ -297,7 +297,7 @@
         this.attrs = [].concat(this.coreattrs, this.i18n, this.events);
 
         // entities
-        this.special_extra = ['object','applet','img','map','iframe'];
+        this.special_extra = ['object','applet','img','map','iframe', 'embed'];
         this.special_basic=['br','span','bdo'];
         this.special = [].concat(this.special_basic, this.special_extra);
         this.fontstyle_extra = ['big','small','font','basefont'];
@@ -368,6 +368,7 @@
         this.basefont = ['id','size','color','face'];
         this.font = el.coreattrs.concat(el.i18n, 'size','color','face');
         this.object = el.attrs.concat('declare','classid','codebase','data','type','codetype','archive','standby','height','width','usemap','name','tabindex','align','border','hspace','vspace');
+        this.embed=['*'];
         this.param = ['id','name','value','valuetype','type'];
         this.applet = el.coreattrs.concat('codebase','archive','code','object','alt','name','width','height','align','hspace','vspace');
         this.img = el.attrs.concat('src','alt','name','longdesc','height','width','usemap','ismap','align','border','hspace','vspace');
@@ -427,9 +428,9 @@
 
         setStates(['ul', 'ol', 'menu', 'dir', 'ul'], ['li']);
         setStates(['dl'], ['dt','dd']);
-        setStates(['pre'], validation._exclude(el.Inline, "img|object|applet|big|small|sub|sup|font|basefont"));
+        setStates(['pre'], validation._exclude(el.Inline, "img|object|embed|applet|big|small|sub|sup|font|basefont"));
         setStates(['a'], validation._exclude(el.Inline, "a"));
-        setStates(['applet', 'object'], ['#PCDATA', 'param','form'].concat(el.block, el.inline, el.misc));
+        setStates(['applet', 'object','embed'], ['#PCDATA', 'param','form'].concat(el.block, el.inline, el.misc));
         setStates(['map'], ['form', 'area'].concat(el.block, el.misc));
         setStates(['form'], validation._exclude(el.Flow, ['form']));
         setStates(['select'], ['optgroup','option']);
@@ -556,7 +557,7 @@
                 parentNode.appendChild(p);
                 return false;
             }
-            if (!node.nextSibling && parentNode.nodeName.test(/p|div/)) return false;
+            if (!node.nextSibling && /p|div/i.test(parentNode.nodeName)) return false;
             return true;
         };
     }

From wiggy at codespeak.net  Thu Apr 19 12:35:01 2007
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Thu, 19 Apr 2007 12:35:01 +0200 (CEST)
Subject: [kupu-checkins] r42164 - kupu/branch/kupu-1.3/plone/kupu_plone_layer
Message-ID: <20070419103501.9738C809D@code0.codespeak.net>

Author: wiggy
Date: Thu Apr 19 12:35:01 2007
New Revision: 42164

Modified:
   kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuInfoForBrains.py
Log:
We can not use aq_base in rescricted mode

Modified: kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuInfoForBrains.py
==============================================================================
--- kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuInfoForBrains.py	(original)
+++ kupu/branch/kupu-1.3/plone/kupu_plone_layer/kupuInfoForBrains.py	Thu Apr 19 12:35:01 2007
@@ -167,15 +167,14 @@
 res = []
 
 portal = url_tool.getPortalObject()
-portal = portal.aq_base
-if linkhere and portal is not context.aq_base:
+if linkhere and portal is not context.aq_inner:
     data = info_object(context, False)
     if data:
         data['label'] = '. (%s)' % context.title_or_id()
         res.append(data)
 
 if linkparent:
-    if portal is not context.aq_base:
+    if portal is not context.aq_inner:
         data = info_object(context.aq_parent, True)
         if data:
             data['label'] = '.. (Parent folder)'

From limi at codespeak.net  Tue Apr 24 02:32:36 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Tue, 24 Apr 2007 02:32:36 +0200 (CEST)
Subject: [kupu-checkins] r42277 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070424003236.226D08099@code0.codespeak.net>

Author: limi
Date: Tue Apr 24 02:32:35 2007
New Revision: 42277

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
Log:
Whitespace.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	Tue Apr 24 02:32:35 2007
@@ -4,12 +4,12 @@
     <link rel="stylesheet" type="text/css" href="#" tal:attributes="href string:${here/portal_url}/kupuplone.css" />
     <tal:plone21 condition="exists:here/portal_css">
        <tal:plone25 condition="exists:here/renderAllTheStylesheets">
-	    <metal:css metal:use-macro="here/renderAllTheStylesheets/macros/cssrenderer|nothing">
-		<!-- Fetch stylesheets from the CSS Registry -->
-	    </metal:css>
+        <metal:css metal:use-macro="here/renderAllTheStylesheets/macros/cssrenderer|nothing">
+        <!-- Fetch stylesheets from the CSS Registry -->
+        </metal:css>
        </tal:plone25>
        <tal:plone3 condition="not:exists:here/renderAllTheStylesheets">
-	  <tal:styles replace="structure context/emptypageresources" />
+      <tal:styles replace="structure context/emptypageresources" />
        </tal:plone3>
     </tal:plone21>
     <tal:plone20 condition="not:exists:here/portal_css">

From limi at codespeak.net  Tue Apr 24 02:41:12 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Tue, 24 Apr 2007 02:41:12 +0200 (CEST)
Subject: [kupu-checkins] r42278 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070424004112.A0B3B8099@code0.codespeak.net>

Author: limi
Date: Tue Apr 24 02:41:12 2007
New Revision: 42278

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
Log:
Updating the ID to reflect the change in http://dev.plone.org/plone/ticket/6465 ? the ID on the tag in Kupu's template didn't exist prior to the 1.4 release anyway, so shouldn't cause any problems. Will need a release to go with the Plone 3.0 beta2, though - sorry about that. Trying to restore some sanity here. :)

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	Tue Apr 24 02:41:12 2007
@@ -21,7 +21,7 @@
           tail python:test(folderish, '/', '');"
         tal:attributes="href string:${request/URL1}${tail}" />
   </head>
-  <body class="kupu documentContent" id="region-content">
+  <body class="kupu documentContent" id="content">
 
    <tal:comment replace="nothing">    
       This template is an empty placeholder, used for loading contents

From wiggy at codespeak.net  Wed Apr 25 23:18:11 2007
From: wiggy at codespeak.net (wiggy at codespeak.net)
Date: Wed, 25 Apr 2007 23:18:11 +0200 (CEST)
Subject: [kupu-checkins] r42337 - kupu/trunk/kupu/plone
Message-ID: <20070425211811.8D23F807E@code0.codespeak.net>

Author: wiggy
Date: Wed Apr 25 23:18:10 2007
New Revision: 42337

Modified:
   kupu/trunk/kupu/plone/plonedrawers.py
   kupu/trunk/kupu/plone/util.py
Log:
Remove getUtility related code; the getToolByName deprecation has been removed from CMF 2.1

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Wed Apr 25 23:18:10 2007
@@ -523,7 +523,7 @@
 
         if allow_browse and context is not portal:
             parent = context.aq_parent
-            pt = getattr(parent.aq_base, 'portal_type', None)
+            pt = getattr(parent, 'portal_type', None)
             if pt in collection_type.portal_types:
                 data = self.getSingleObjectInfo(parent, resource_type)
                 data['label'] = '.. (Parent folder)'

Modified: kupu/trunk/kupu/plone/util.py
==============================================================================
--- kupu/trunk/kupu/plone/util.py	(original)
+++ kupu/trunk/kupu/plone/util.py	Wed Apr 25 23:18:10 2007
@@ -13,53 +13,8 @@
 
 # trying to get rid of some deprecation warnings in a
 # backwards compatible way
-try:
-    from zope.component import getUtility
-    from zope.component.interfaces import ComponentLookupError
-    HAVE_GET_UTILITY = True
-except ImportError:
-    HAVE_GET_UTILITY = False
-from Products.CMFCore.utils import getToolByName as gtbn
-
-if HAVE_GET_UTILITY:
-    INTERFACEMAP = {
-        'portal_catalog': ('Products.CMFCore.interfaces', 'ICatalogTool'),
-        'portal_memberdata': ('Products.CMFCore.interfaces', 'IMemberDataTool'),
-        'portal_membership': ('Products.CMFCore.interfaces', 'IMembershipTool'),
-        'portal_types': ('Products.CMFCore.interfaces', 'ITypesTool'),
-        'portal_url': ('Products.CMFCore.interfaces', 'IURLTool'),
-        'portal_workflow': ('Products.CMFCore.interfaces', 'IWorkflowTool'),
-        'plone_utils': ('Products.CMFPlone.interfaces', 'IPloneTool'),
-        'portal_interface': ('Products.CMFPlone.interfaces', 'IInterfaceTool'),
-        'portal_skins': ('Products.CMFPlone.interfaces', 'ISkinsContainer'),
-        'content_type_registry': ('Products.CMFPlone.interfaces', 'IContentTypeRegistry'),
-        'portal_quickinstaller': ('Products.CMFQuickInstallerTool.interfaces', 'IQuickInstallerTool'),
-        'archetype_tool': ('Products.Archetypes.interfaces', 'IArchetypeTool'),
-        'reference_catalog': ('Products.Archetypes.interfaces', 'IReferenceCatalog'),
-        'uid_catalog': ('Products.Archetypes.interfaces', 'IUIDCatalog'),
-        'mimetypes_registry': ('Products.MimetypesRegistry.interfaces', 'IMimetypesRegistryTool'),
-        'portal_transforms': ('Products.PortalTransforms.interfaces', 'IPortalTransformsTool'),
-        'kupu_library_tool': ('Products.kupu.plone.z3interfaces', 'IPloneKupuLibraryTool'),
-        }
-    iname_mapping = {}
-    for id, (module, interface) in INTERFACEMAP.iteritems():
-        mod = __import__(module, globals(), locals(), [interface])
-        if hasattr(mod, interface):
-            iname_mapping[id] = getattr(mod, interface)
-
-
-security.declarePublic('getToolByName')
-def getToolByName(context, tool_name, default=None):
-    if HAVE_GET_UTILITY:
-        interface = iname_mapping.get(tool_name, None)
-        if interface is not None:
-            try:
-                return getUtility(interface)
-            except ComponentLookupError:
-                # Behave in backward compatible way
-                # fall through to old implementation
-                pass
-    return gtbn(context, tool_name, default)
+from Products.CMFCore.utils import getToolByName
+
 
 def register_layer(self, relpath, name, out, add=True):
     """Register a file system directory as skin layer

From limi at codespeak.net  Thu Apr 26 01:23:12 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Thu, 26 Apr 2007 01:23:12 +0200 (CEST)
Subject: [kupu-checkins] r42342 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer
Message-ID: <20070425232312.3C450807E@code0.codespeak.net>

Author: limi
Date: Thu Apr 26 01:23:10 2007
New Revision: 42342

Modified:
   kupu/trunk/kupu/plone/exportimport.py
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/kupu2html.py
   kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py
   kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuUploadImage.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/librarytool.py
   kupu/trunk/kupu/plone/plonedrawers.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/util.py
Log:
Removing the getUtility workarounds now that it has been undeprecated in CMF.


Modified: kupu/trunk/kupu/plone/exportimport.py
==============================================================================
--- kupu/trunk/kupu/plone/exportimport.py	(original)
+++ kupu/trunk/kupu/plone/exportimport.py	Thu Apr 26 01:23:10 2007
@@ -20,7 +20,7 @@
 from Globals import package_home
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 
 from Products.GenericSetup.utils import CONVERTER
 from Products.GenericSetup.utils import DEFAULT

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Thu Apr 26 01:23:10 2007
@@ -10,7 +10,7 @@
 from Products.PortalTransforms.interfaces import itransform
 from DocumentTemplate.DT_Util import html_quote
 from DocumentTemplate.DT_Var import newline_to_br
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 import re
 from cgi import escape
 from urlparse import urlsplit, urljoin, urlunsplit

Modified: kupu/trunk/kupu/plone/kupu2html.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu2html.py	(original)
+++ kupu/trunk/kupu/plone/kupu2html.py	Thu Apr 26 01:23:10 2007
@@ -9,7 +9,7 @@
 
 from Products.PortalTransforms.interfaces import itransform
 from Products.kupu.plone import html2captioned
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 
 class KupuOutputTransform(html2captioned.HTMLToCaptioned):
     """Transform which adds captions to images embedded in HTML"""

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py	Thu Apr 26 01:23:10 2007
@@ -6,7 +6,7 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
 ##parameters=fieldname
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 
 from Products.CMFCore.utils import getToolByName
 tool = getToolByName(context, 'kupu_library_tool')

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py	Thu Apr 26 01:23:10 2007
@@ -6,7 +6,7 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
 ##parameters=fieldname, content
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 from Products.PythonScripts.standard import structured_text, newline_to_br
 
 field = context.getField(fieldname)

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuUploadImage.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuUploadImage.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuUploadImage.py	Thu Apr 26 01:23:10 2007
@@ -6,7 +6,7 @@
 ##bind subpath=traverse_subpath
 ##parameters=node_prop_title, node_prop_desc, node_prop_image
 
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 from Products.PythonScripts.standard import html_quote, newline_to_br
 request = context.REQUEST
 RESPONSE =  request.RESPONSE

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	Thu Apr 26 01:23:10 2007
@@ -10,7 +10,7 @@
     >
 
 <tal:with define="
-    getToolByName nocall:modules/Products.kupu.plone.util/getToolByName;
+    getToolByName nocall:modules/Products.CMFCore.utils/getToolByName;
     kupu_tool     python:getToolByName(context, 'kupu_library_tool');
     libraries     python:kupu_tool.getCookedLibraries(context);
     ">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	Thu Apr 26 01:23:10 2007
@@ -7,7 +7,7 @@
 ##bind subpath=traverse_subpath
 ##parameters=
 # (reference_url is supposed to do the same thing, but is broken)
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 from Products.PythonScripts.standard import html_quote
 
 request = context.REQUEST

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	Thu Apr 26 01:23:10 2007
@@ -11,7 +11,7 @@
 # Make a copy of this script called 'kupu-customisation-policy'
 # in any skin folder on your site and edit it to set up your own
 # preferred kupu configuration.
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 
 RESOURCES = dict(
     linkable = ('Document', 'Image', 'File', 'News Item', 'Event', 'Folder', 'Large Plone Folder'),

Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Thu Apr 26 01:23:10 2007
@@ -18,7 +18,7 @@
 from Products.CMFCore.Expression import Expression, createExprContext
 from Products.PageTemplates.Expressions import getEngine, SecureModuleImporter
 from Products.kupu.plone.interfaces import IKupuLibraryTool
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 
 class KupuError(Exception): pass
 NEWTYPE_IGNORE, NEWTYPE_ADD = 0, 1

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Thu Apr 26 01:23:10 2007
@@ -22,7 +22,7 @@
 from Products.Archetypes.interfaces.referenceable import IReferenceable
 from Products.PythonScripts.standard import html_quote, newline_to_br
 from Products.kupu.plone.librarytool import KupuError
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 import html2captioned
 
 try:

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Thu Apr 26 01:23:10 2007
@@ -29,7 +29,7 @@
 
 from Products.kupu.plone.librarytool import KupuLibraryTool
 from Products.kupu.plone import permissions, scanner, plonedrawers, util, helpers
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 from Products.kupu import kupu_globals
 from Products.kupu.config import TOOLNAME, TOOLTITLE
 from StringIO import StringIO

Modified: kupu/trunk/kupu/plone/util.py
==============================================================================
--- kupu/trunk/kupu/plone/util.py	(original)
+++ kupu/trunk/kupu/plone/util.py	Thu Apr 26 01:23:10 2007
@@ -6,16 +6,12 @@
 from Products.MimetypesRegistry import MimeTypeItem
 from Products.kupu import kupu_globals
 
-from AccessControl import ModuleSecurityInfo
-security = ModuleSecurityInfo('Products.kupu.plone.util')
-
 kupu_package_dir = package_home(kupu_globals)
 
 # trying to get rid of some deprecation warnings in a
 # backwards compatible way
 from Products.CMFCore.utils import getToolByName
 
-
 def register_layer(self, relpath, name, out, add=True):
     """Register a file system directory as skin layer
     """

From limi at codespeak.net  Thu Apr 26 01:42:49 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Thu, 26 Apr 2007 01:42:49 +0200 (CEST)
Subject: [kupu-checkins] r42343 - kupu/trunk/kupu/plone
Message-ID: <20070425234249.C04318062@code0.codespeak.net>

Author: limi
Date: Thu Apr 26 01:42:49 2007
New Revision: 42343

Modified:
   kupu/trunk/kupu/plone/ReftextField.py
Log:
Forgot this one :)


Modified: kupu/trunk/kupu/plone/ReftextField.py
==============================================================================
--- kupu/trunk/kupu/plone/ReftextField.py	(original)
+++ kupu/trunk/kupu/plone/ReftextField.py	Thu Apr 26 01:42:49 2007
@@ -5,7 +5,7 @@
 from Products.Archetypes.ReferenceEngine import Reference
 from Products.Archetypes.exceptions import ReferenceException
 from ZPublisher.HTTPRequest import FileUpload
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
 import re
 
 # UID_PATTERN matches a UID in an anchor or image tag.

From limi at codespeak.net  Thu Apr 26 02:03:06 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Thu, 26 Apr 2007 02:03:06 +0200 (CEST)
Subject: [kupu-checkins] r42344 - in kupu/trunk/kupu: doc plone
Message-ID: <20070426000306.ED13A807E@code0.codespeak.net>

Author: limi
Date: Thu Apr 26 02:03:06 2007
New Revision: 42344

Modified:
   kupu/trunk/kupu/doc/PLONE2.txt
   kupu/trunk/kupu/plone/kupu_config.pt
   kupu/trunk/kupu/plone/libraries.pt
   kupu/trunk/kupu/plone/resource_types.pt
   kupu/trunk/kupu/plone/zmi_docs.pt
   kupu/trunk/kupu/plone/zmi_toolbar.pt
Log:
Upgrading the configuration screens to match Plone 2.1 and up (I believe). Duncan, please help me test this on earlier versions of Plone, I don't have any Plone 2.0 or 2.1 instances handy.

Modified: kupu/trunk/kupu/doc/PLONE2.txt
==============================================================================
--- kupu/trunk/kupu/doc/PLONE2.txt	(original)
+++ kupu/trunk/kupu/doc/PLONE2.txt	Thu Apr 26 02:03:06 2007
@@ -1,6 +1,6 @@
-=========================
-Installing Kupu in Plone2
-=========================
+========================
+Installing Kupu in Plone
+========================
 
 .. contents:: Table of Contents
    :depth: 2

Modified: kupu/trunk/kupu/plone/kupu_config.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_config.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_config.pt	Thu Apr 26 02:03:06 2007
@@ -1,33 +1,23 @@
 <metal:page define-macro="master">
-<metal:master use-macro="here/main_template/macros/master"
+<metal:master use-macro="here/prefs_main_template/macros/master"
     i18n:domain="kupuconfig">
 
 <metal:block metal:fill-slot="top_slot" define-slot="top_slot"
              tal:define="dummy python:request.set('disable_border',1)" />
 
-<metal:fillbase fill-slot="base">
-  <metal:baseslot define-slot="base">
-    <base href="" tal:attributes="href template/absolute_url" />
-  </metal:baseslot>
-</metal:fillbase>
-
-    <metal:cssslot fill-slot="css_slot">
-      <!-- A slot where you can insert CSS in the header from a template -->
-      <metal:cssslot define-slot="css_slot" />
-    </metal:cssslot>
-
-    <metal:override fill-slot="portlets_one_slot">
-      <metal:prefs use-macro="here/portlet_prefs/macros/portlet" />
-    </metal:override>
+    <metal:fillbase fill-slot="base">
+      <metal:baseslot define-slot="base">
+        <base href="" tal:attributes="href template/absolute_url" />
+      </metal:baseslot>
+    </metal:fillbase>
+
 
     <metal:override fill-slot="column_two_slot" />
 
 <body>
-<div metal:fill-slot="main" metal:define-slot="prefs_configlet_main"
+<div metal:fill-slot="prefs_configlet_content" metal:define-slot="prefs_configlet_main"
     tal:define="errors python:request.get('errors', {});">
 
-<div class="configlet">
-
 <div class="documentEditable">
 
     <!-- simulating views -->
@@ -49,7 +39,8 @@
     </div>        
     <!-- End of tabs -->
     <div class="documentContent" metal:define-slot="kupu_content">
-<h3 i18n:translate="heading_configuration">Kupu Configuration</h3>
+<h1 class="documentFirstHeading"
+    i18n:translate="heading_configuration">Kupu Configuration</h1>
 <form action=""
     name="configure_kupu"
     method="post"
@@ -304,7 +295,6 @@
 </form>
     </div>
 
-</div>
 
 </div>
 

Modified: kupu/trunk/kupu/plone/libraries.pt
==============================================================================
--- kupu/trunk/kupu/plone/libraries.pt	(original)
+++ kupu/trunk/kupu/plone/libraries.pt	Thu Apr 26 02:03:06 2007
@@ -6,11 +6,11 @@
 <body>
 
     <div class="documentContent" metal:fill-slot="kupu_content">
-<h3 i18n:translate="heading_kupu_configuration">Kupu Configuration</h3>
-<h4 i18n:translate="label_manage_libraries">Manage libraries</h4>
+<h1 class="documentFirstHeading"
+    i18n:translate="heading_kupu_libraries">Kupu Libraries</h1>
 
 <p i18n:translate="text_kupu_drawers">In the below form, you may manage the list of drawer libraries for
-the kupu editor. Each property of a library is dynamically expanded at
+the Kupu editor. Each property of a library is dynamically expanded at
 execution time using TALES expressions. That way it is possible, to
 support libraries like <em>Current folder</em> or <em>My folder</em>
 very easily.</p>

Modified: kupu/trunk/kupu/plone/resource_types.pt
==============================================================================
--- kupu/trunk/kupu/plone/resource_types.pt	(original)
+++ kupu/trunk/kupu/plone/resource_types.pt	Thu Apr 26 02:03:06 2007
@@ -6,7 +6,8 @@
 <body>
 
     <div class="documentContent" metal:fill-slot="kupu_content">
-<h3 i18n:translate="heading_kupu_configuration">Kupu Configuration</h3>
+<h1 class="documentFirstHeading"
+    i18n:translate="heading_kupu_resource_types">Kupu Resource Types</h1>
 <form action="" method="post" tal:attributes="action here/absolute_url">
 <p i18n:translate="text_resource_types">While libraries provide abstract locations for objects of any type,
 Kupu distinguishes objects by resource type. For example, a user might

Modified: kupu/trunk/kupu/plone/zmi_docs.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_docs.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_docs.pt	Thu Apr 26 02:03:06 2007
@@ -3,244 +3,6 @@
     metal:use-macro="here/kupu_config/macros/master"
     i18n:domain="plone">
 
-<metal:cssslot fill-slot="css_slot">
-<style>
-/*
-:Author: David Goodger
-:Contact: goodger at users.sourceforge.net
-:date: $Date: 2004/06/23 13:31:26 $
-:version: $Revision: 1.37 $
-:copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-*/
-h3, h4, h5 { clear: none!IMPORTANT; }
-
-.first {
-  margin-top: 0 }
-
-.last {
-  margin-bottom: 0 }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-blockquote.epigraph {
-  margin: 2em 5em ; }
-
-dd {
-  margin-bottom: 0.5em }
-
-/* Uncomment (& remove this text!) to get bold-faced definition list terms
-dt {
-  font-weight: bold }
-*/
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.attention, div.caution, div.danger, div.error, div.hint,
-div.important, div.note, div.tip, div.warning, div.admonition {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.hint p.admonition-title, div.important p.admonition-title,
-div.note p.admonition-title, div.tip p.admonition-title,
-div.admonition p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em }
-
-div.footer, div.header {
-  font-size: smaller }
-
-div.sidebar, div.contents {
-  margin-left: 1em ;
-  border: medium outset ;
-  padding: 0em 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h2.title {
-  background-image: url(kupuimages/kupu_icon.gif);
-  background-repeat: no-repeat;
-  background-position: center left;
-  padding-left: 32px; }
-
-hr {
-  width: 75% }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font-family: serif ;
-  font-size: 100% }
-
-pre.line-block {
-  font-family: serif ;
-  font-size: 100% }
-
-pre.literal-block, pre.doctest-block {
-  margin-left: 2em ;
-  margin-right: 2em ;
-  background-color: #eeeeee }
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.option-argument {
-  font-style: italic }
-
-span.pre {
-  white-space: nowrap }
-
-span.problematic {
-  color: red }
-
-table {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.citation {
-  border-left: solid thin gray ;
-  padding-left: 0.5ex }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.footnote {
-  border-left: solid thin black ;
-  padding-left: 0.5ex }
-
-td, th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-th.docinfo-name, th.field-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap }
-
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
-  font-size: 100% }
-
-tt {
-  background-color: #eeeeee }
-
-ul.auto-toc {
-  list-style-type: none; list-style-image: none;
-}
-</style>
-</metal:cssslot>
 <body>
 
     <div class="documentContent" metal:fill-slot="kupu_content"

Modified: kupu/trunk/kupu/plone/zmi_toolbar.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_toolbar.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_toolbar.pt	Thu Apr 26 02:03:06 2007
@@ -17,7 +17,8 @@
   <body>
 
     <div class="documentContent" metal:fill-slot="kupu_content">
-      <h3 i18n:translate="heading_configuration">Kupu Toolbar Configuration</h3>
+      <h1 class="documentFirstHeading"
+          i18n:translate="heading_configuration">Kupu Toolbar Configuration</h1>
       <form action=""
             name="configure_kupu_toolbar"
             method="post"

From limi at codespeak.net  Thu Apr 26 09:05:03 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Thu, 26 Apr 2007 09:05:03 +0200 (CEST)
Subject: [kupu-checkins] r42348 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070426070503.40C378079@code0.codespeak.net>

Author: limi
Date: Thu Apr 26 09:05:02 2007
New Revision: 42348

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
Log:
This has now been turned off in the config, so this is no longer needed.

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	Thu Apr 26 09:05:02 2007
@@ -107,13 +107,6 @@
   margin-bottom:4px;
 }
 
-/* Since we define bullet styles in the CSS in Plone, the bullet selector has no meaning.
-   Bullet styles belong in the style sheet, not in the HTML. ;)
-   Remove this if you want it back. */
-#kupu-ulstyles {
-    display: none !important;
-}
-
 body.documentContent { padding: 1em !important; }
 
 html.kupu-html {

From limi at codespeak.net  Sat Apr 28 12:29:22 2007
From: limi at codespeak.net (limi at codespeak.net)
Date: Sat, 28 Apr 2007 12:29:22 +0200 (CEST)
Subject: [kupu-checkins] r42388 - in kupu/trunk/kupu/plone: .
	kupu_plone_layer kupu_references
Message-ID: <20070428102922.0621F8067@code0.codespeak.net>

Author: limi
Date: Sat Apr 28 12:29:22 2007
New Revision: 42388

Modified:
   kupu/trunk/kupu/plone/body.kupu
   kupu/trunk/kupu/plone/kupu_config.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt
   kupu/trunk/kupu/plone/wysiwyg_support.kupu
   kupu/trunk/kupu/plone/zmi_toolbar.pt
Log:
Death to tabindexes!

Modified: kupu/trunk/kupu/plone/body.kupu
==============================================================================
--- kupu/trunk/kupu/plone/body.kupu	(original)
+++ kupu/trunk/kupu/plone/body.kupu	Sat Apr 28 12:29:22 2007
@@ -15,9 +15,8 @@
         tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True);
                     base kupu_base_override|base;"
         tal:attributes="src string:${base}/emptypage;
-                        tabindex tabindex/next|nothing;
-			id string:kupu-editor-iframe-${fname};
-			name string:kupu-editor-iframe-${fname};"
+                        id string:kupu-editor-iframe-${fname};
+                        name string:kupu-editor-iframe-${fname};"
         >
     </iframe>
      <input type="hidden" name="text_format:default" value="text/html"
@@ -28,7 +27,6 @@
      />
 <tal:test condition="fieldName|nothing">
     <textarea cols="80" rows="25"
-        tabindex=""
         class="kupu-editor-textarea"
         name="description"
         tal:condition="fieldName|nothing"
@@ -37,13 +35,11 @@
         tal:attributes="name inputname;
                         onfocus onfocus|nothing;
                         onblur onblur|nothing;
-                        tabindex tabindex|nothing;
                         rows rows|default;
                         cols cols|default;">
     </textarea>
 </tal:test>
     <textarea cols="80" rows="25"
-        tabindex=""
         class="kupu-editor-textarea"
         name="description"
         id="kupu-editor-textarea"
@@ -59,7 +55,6 @@
         tal:attributes="name inputname;
                         onfocus onfocus|nothing;
                         onblur onblur|nothing;
-                        tabindex tabindex|nothing;
                         rows rows|default;
                         cols cols|default;">
     </textarea>

Modified: kupu/trunk/kupu/plone/kupu_config.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_config.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_config.pt	Sat Apr 28 12:29:22 2007
@@ -285,12 +285,10 @@
 </fieldset>
 
 <input class="context"
-        tabindex=""
         type="submit"
         name="configure_kupu:method"
         value="Save"
         i18n:attributes="value"
-        tal:attributes="tabindex tabindex|nothing;"
         />
 </form>
     </div>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Sat Apr 28 12:29:22 2007
@@ -436,18 +436,70 @@
     </table>
   <script type="text/javascript">var focuscount = 0;</script>
     <div>
-    <iframe class="kupu-editor-iframe" frameborder="0" src="emptypage" onfocus="this.contentWindow.focus();" tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True);                     base kupu_base_override|base;" tal:attributes="src string:${base}/emptypage;                         tabindex tabindex/next|nothing;    id string:kupu-editor-iframe-${fname};    name string:kupu-editor-iframe-${fname};">
+    <iframe class="kupu-editor-iframe" 
+            frameborder="0" 
+            src="emptypage" 
+            onfocus="this.contentWindow.focus();" 
+            tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True);
+                        base kupu_base_override|base;" 
+            tal:attributes="src string:${base}/emptypage;
+                            id string:kupu-editor-iframe-${fname};
+                            name string:kupu-editor-iframe-${fname};">
     </iframe>
-     <input type="hidden" name="text_format:default" value="text/html" tal:define="fieldName fieldName|inputname|nothing;                 val python:fieldName and 'text/html' or 'html';                 fieldName python:test(fieldName, fieldName+'_', '') + 'text_format:default';" tal:attributes="name fieldName;value val;"/>
+     <input type="hidden" 
+            name="text_format:default" 
+            value="text/html" 
+            tal:define="fieldName fieldName|inputname|nothing;
+                        val python:fieldName and 'text/html' or 'html';
+                        fieldName python:test(fieldName, fieldName+'_', '') + 'text_format:default';" 
+            tal:attributes="name fieldName;value val;" 
+            />
 <tal:test condition="fieldName|nothing">
-    <textarea cols="80" rows="25" tabindex="" class="kupu-editor-textarea" name="description" tal:condition="fieldName|nothing" tal:define="global kupu_content python:here.convertContentForKupu(fieldName, inputvalue);" tal:content="kupu_content" tal:attributes="name inputname;                         onfocus onfocus|nothing;                         onblur onblur|nothing;                         tabindex tabindex|nothing;                         rows rows|default;                         cols cols|default;">
+    <textarea cols="80" 
+              rows="25" 
+              class="kupu-editor-textarea" 
+              name="description" 
+              tal:condition="fieldName|nothing" 
+              tal:define="global kupu_content python:here.convertContentForKupu(fieldName, inputvalue);"
+              tal:content="kupu_content"
+              tal:attributes="name inputname;
+                              onfocus onfocus|nothing;
+                              onblur onblur|nothing;
+                              rows rows|default;
+                              cols cols|default;">
     </textarea>
 </tal:test>
-    <textarea cols="80" rows="25" tabindex="" class="kupu-editor-textarea" name="description" id="kupu-editor-textarea" tal:define="pss modules/Products/PythonScripts/standard;                 text_format text_format | python: getattr(here,'text_format','html');                 is_stx python:text_format=='structured-text';                 is_ptx python:text_format=='plain';" tal:condition="not:fieldName|nothing" tal:content="python:(is_stx and pss.structured_text(inputvalue))                                     or (is_ptx and pss.newline_to_br(inputvalue))                                     or inputvalue" tal:attributes="name inputname;                         onfocus onfocus|nothing;                         onblur onblur|nothing;                         tabindex tabindex|nothing;                         rows rows|default;                         cols cols|default;">
+    <textarea cols="80" 
+              rows="25" 
+              class="kupu-editor-textarea" 
+              name="description" 
+              id="kupu-editor-textarea" 
+              tal:define="pss modules/Products/PythonScripts/standard;
+                          text_format text_format | python: getattr(here,'text_format','html');
+                          is_stx python:text_format=='structured-text';
+                          is_ptx python:text_format=='plain';"
+              tal:condition="not:fieldName|nothing" 
+              tal:content="python:(is_stx and pss.structured_text(inputvalue))
+                                           or (is_ptx and pss.newline_to_br(inputvalue))
+                                           or inputvalue" 
+              tal:attributes="name inputname;
+                                   onfocus onfocus|nothing;
+                                   onblur onblur|nothing;
+                                   rows rows|default;
+                                   cols cols|default;">
     </textarea>
     </div>
   
-    <div class="kupuoverride" tal:condition="python:exists('kupu_content') and len(kupu_content)==0" tal:define="floated widget/allow_file_upload | python:1;" tal:attributes="style python:test(floated, 'float:left;;', '');"><span class="discreet"><a class="forcekupu" href="#" i18n:translate="suppress-kupu" tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName};" title="reload current page without kupu">
+    <div class="kupuoverride" 
+         tal:condition="python:exists('kupu_content') and len(kupu_content)==0" 
+         tal:define="floated widget/allow_file_upload | python:1;" 
+         tal:attributes="style python:test(floated, 'float:left;;', '');">
+         <span class="discreet">
+             <a class="forcekupu" 
+                href="#" 
+                i18n:translate="suppress-kupu" 
+                tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName};" 
+                title="Reload current page without visual editor">
          Edit without visual editor
       </a></span>
     </div>
@@ -466,7 +518,16 @@
     <link href="kupudrawerstyles.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupudrawerstyles.css"/>
    </tal:test>
   
-    <textarea cols="80" rows="25" tabindex="" name="fieldName" tal:content="inputvalue" tal:attributes="name fieldName|inputname;                         id fieldName|inputname;                         onfocus onfocus|nothing;                         onblur onblur|nothing;                         tabindex tabindex|nothing;                         rows rows|default;                         cols cols|default;">
+    <textarea cols="80" 
+              rows="25" 
+              name="fieldName" 
+              tal:content="inputvalue" 
+              tal:attributes="name fieldName|inputname;
+                              id fieldName|inputname;
+                              onfocus onfocus|nothing;
+                              onblur onblur|nothing;
+                              rows rows|default;
+                              cols cols|default;">
     </textarea>
   
     <tal:archetypes tal:condition="fieldName|nothing">
@@ -501,13 +562,31 @@
        Text and type the document as you usually do.
      </div>
 
-     <input class="noborder" type="radio" name="text_format" value="structured-text" tabindex="" id="cb_structuredtext" tal:attributes="checked python:test(text_format=='structured-text', 1, None);                             tabindex tabindex;"/>
+     <input class="noborder" 
+            type="radio" 
+            name="text_format" 
+            value="structured-text" 
+            id="cb_structuredtext" 
+            tal:attributes="checked python:test(text_format=='structured-text', 1, None);"
+            />
      <label for="cb_structuredtext" i18n:translate="structured_text">Structured Text</label> <br/>
 
-     <input class="noborder" type="radio" name="text_format" value="html" tabindex="" id="cb_html" tal:attributes="checked python:test(text_format=='html', 1, None);                             tabindex tabindex;"/>
+     <input class="noborder" 
+            type="radio" 
+            name="text_format" 
+            value="html" 
+            id="cb_html" 
+            tal:attributes="checked python:test(text_format=='html', 1, None);"
+            />
      <label for="cb_html" i18n:translate="html">HTML</label> <br/>
 
-     <input class="noborder" type="radio" name="text_format" value="plain" tabindex="" id="cb_plain" tal:attributes="checked python:test(text_format=='plain', 1, None);                             tabindex tabindex;"/>
+     <input class="noborder" 
+            type="radio" 
+            name="text_format" 
+            value="plain" 
+            id="cb_plain" 
+            tal:attributes="checked python:test(text_format=='plain', 1, None);"
+            />
      <label for="cb_plain" i18n:translate="plain_text">Plain Text</label>
     </tal:nonat>
   </tal:noeditor>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	Sat Apr 28 12:29:22 2007
@@ -72,6 +72,11 @@
 
 /* plone customizations regarding color and borders etc */
 
+/* hide the Plone table of contents if it is visible (inline edit) */
+dl.toc {
+    display: none;
+}
+
 .kupu-tb {
   background-color:&dtml-contentViewBackgroundColor;;
   padding-bottom:0px; margin:0;

Modified: kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt	Sat Apr 28 12:29:22 2007
@@ -180,7 +180,6 @@
                                 value="" 
                                 id="" 
                                 tal:attributes="value obj/title_or_id;
-                                                      tabindex tabindex/next;
                                                       size python:test(widget.size=='', 30, widget.size);
                                                       id string:${fieldName}_label" readonly="readonly" />
                   </tal:block>
@@ -204,11 +203,9 @@
                      tal:define="targets python:[(here.reference_catalog.lookupObject(u),u) for u in uids if u]">
                 <select
                   multiple="multiple"
-                  tabindex=""
                   tal:attributes="name string:${fieldName}:list;
                                         id string:${fieldName};
-                                        size python:test(widget.size=='', 8, widget.size);
-                                        tabindex tabindex/next;">
+                                        size python:test(widget.size=='', 8, widget.size);">
                     <tal:block tal:repeat="set targets">
                         <option value=""
                                      selected="selected"

Modified: kupu/trunk/kupu/plone/wysiwyg_support.kupu
==============================================================================
--- kupu/trunk/kupu/plone/wysiwyg_support.kupu	(original)
+++ kupu/trunk/kupu/plone/wysiwyg_support.kupu	Sat Apr 28 12:29:22 2007
@@ -38,14 +38,12 @@
     <textarea
         cols="80"
         rows="25"
-        tabindex=""
         name="fieldName"
         tal:content="inputvalue"
         tal:attributes="name fieldName|inputname;
                         id fieldName|inputname;
                         onfocus onfocus|nothing;
                         onblur onblur|nothing;
-                        tabindex tabindex|nothing;
                         rows rows|default;
                         cols cols|default;">
     </textarea>
@@ -85,10 +83,8 @@
             type="radio"
             name="text_format"
             value="structured-text"
-            tabindex=""
             id="cb_structuredtext"
-            tal:attributes="checked python:test(text_format=='structured-text', 1, None);
-                            tabindex tabindex;"
+            tal:attributes="checked python:test(text_format=='structured-text', 1, None);"
             />
      <label for="cb_structuredtext" i18n:translate="structured_text">Structured Text</label> <br />
 
@@ -96,10 +92,8 @@
             type="radio"
             name="text_format"
             value="html"
-            tabindex=""
             id="cb_html"
-            tal:attributes="checked python:test(text_format=='html', 1, None);
-                            tabindex tabindex;"
+            tal:attributes="checked python:test(text_format=='html', 1, None);"
             />
      <label for="cb_html" i18n:translate="html">HTML</label> <br />
 
@@ -107,10 +101,8 @@
             type="radio"
             name="text_format"
             value="plain"
-            tabindex=""
             id="cb_plain"
-            tal:attributes="checked python:test(text_format=='plain', 1, None);
-                            tabindex tabindex;"
+            tal:attributes="checked python:test(text_format=='plain', 1, None);"
             />
      <label for="cb_plain" i18n:translate="plain_text">Plain Text</label>
     </tal:nonat>

Modified: kupu/trunk/kupu/plone/zmi_toolbar.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_toolbar.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_toolbar.pt	Sat Apr 28 12:29:22 2007
@@ -88,12 +88,10 @@
         </fieldset>
 
         <input class="context"
-               tabindex=""
                type="submit"
                name="set_toolbar_filters:method"
                value="Save"
                i18n:attributes="value"
-               tal:attributes="tabindex tabindex|nothing;"
                />
       </form>
     </div>

From duncan at codespeak.net  Mon Apr 30 14:50:26 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 30 Apr 2007 14:50:26 +0200 (CEST)
Subject: [kupu-checkins] r42473 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070430125026.4E6DC8077@code0.codespeak.net>

Author: duncan
Date: Mon Apr 30 14:50:25 2007
New Revision: 42473

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
Log:
Fix typo in resolveuid.py

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	Mon Apr 30 14:50:25 2007
@@ -19,7 +19,7 @@
 if not obj:
     hook = getattr(context, 'kupu_resolveuid_hook', None)
     if hook:
-        obj = hook(uid)
+        obj = hook(uuid)
     if not obj:
         return context.standard_error_message(error_type=404,
             error_message='''The link you followed appears to be broken''')

From duncan at codespeak.net  Mon Apr 30 15:57:13 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 30 Apr 2007 15:57:13 +0200 (CEST)
Subject: [kupu-checkins] r42483 - kupu/branch/duncan-flash
Message-ID: <20070430135713.6AB57807A@code0.codespeak.net>

Author: duncan
Date: Mon Apr 30 15:57:13 2007
New Revision: 42483

Added:
   kupu/branch/duncan-flash/
      - copied from r42482, kupu/trunk/kupu/
Log:
Created a branch to add Flash support

From duncan at codespeak.net  Mon Apr 30 16:22:35 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 30 Apr 2007 16:22:35 +0200 (CEST)
Subject: [kupu-checkins] r42487 - in kupu/branch/duncan-flash: common doc
	plone plone/kupu_plone_layer
Message-ID: <20070430142235.935CD806B@code0.codespeak.net>

Author: duncan
Date: Mon Apr 30 16:22:35 2007
New Revision: 42487

Modified:
   kupu/branch/duncan-flash/common/kupubasetools.js
   kupu/branch/duncan-flash/doc/LIBRARIES.txt
   kupu/branch/duncan-flash/doc/PLONE2.txt
   kupu/branch/duncan-flash/plone/kupu_plone_layer/kupucollection.xml.pt
   kupu/branch/duncan-flash/plone/librarytool.py
   kupu/branch/duncan-flash/plone/plonedrawers.py
   kupu/branch/duncan-flash/plone/plonelibrarytool.py
   kupu/branch/duncan-flash/plone/resource_types.pt
Log:
Partially implemented support for Flash media.
So far: allows adding a Flash content type to resource library for media (probably just ATFlashMovie since that's what I'm using) and includes a new xml tag to distinguish flash from images.
To do: make xsl expose the media field to the javascript, fix up filtering to not remove the object tag.

Modified: kupu/branch/duncan-flash/common/kupubasetools.js
==============================================================================
--- kupu/branch/duncan-flash/common/kupubasetools.js	(original)
+++ kupu/branch/duncan-flash/common/kupubasetools.js	Mon Apr 30 16:22:35 2007
@@ -1271,6 +1271,13 @@
         return img;
     };
 
+    this.createObject = function(url, type, alttext, className, width, height) {
+        var ed = this.editor;
+        var obj = ed.newElement('object',
+            {src:url, alt:alttext, className:className, width:width, height:height, type:type}
+            [ed.newElement('param', {name:'movie', value:url})]);
+    }
+
     this.setImageClass = function(imgclass) {
         /* set the class of the selected image */
         var currnode = this.editor.getSelectedNode();

Modified: kupu/branch/duncan-flash/doc/LIBRARIES.txt
==============================================================================
--- kupu/branch/duncan-flash/doc/LIBRARIES.txt	(original)
+++ kupu/branch/duncan-flash/doc/LIBRARIES.txt	Mon Apr 30 16:22:35 2007
@@ -120,7 +120,10 @@
        & element label { text }?
        & 
          ## Icon to use in resource pane
-         element icon { xsd:anyURI }?)
+         element icon { xsd:anyURI }?
+       & 
+         ## Type of media to insert in document 
+         element media { text }?)
 
     ## A list of collections and resources with an optional upload button at the end.
     collectionItems =
@@ -405,13 +408,27 @@
   - Go to the kupu configlet/resource types tab. Scroll to the bottom
     of the page.
 
-  - Under 'preview URLs' select the type 'Image' and under URL enter:
+  - Under 'preview URLs' select the type 'Image' and under preview enter:
 
     string:${object_url}/image_thumb
 
   - Hit the 'Save' button.
 
 
+Flash support
+-------------
+
+To support Flash you need a separate content type (such as ATFlashMovie). 
+1. Add this content type to the mediaobject resource type.
+2. Add the type under the 'action urls' section at the bottom of the
+   resource types tab. Put in appropriate expressions for the urls (for
+   ATFlashMove the 'Normal Image' expression is:
+   'string:${object_url}/download'. Select type 'flash'.
+
+N.B. This function is not yet fully implemented, so when you've done
+that it still won't work. Watch this space...
+
+
 Futures
 -------
 

Modified: kupu/branch/duncan-flash/doc/PLONE2.txt
==============================================================================
--- kupu/branch/duncan-flash/doc/PLONE2.txt	(original)
+++ kupu/branch/duncan-flash/doc/PLONE2.txt	Mon Apr 30 16:22:35 2007
@@ -339,6 +339,15 @@
         Defaults to 'image'. N.B. This is a literal string, not a tal
         expression.
 
+    classes
+        An optional list of class names to be allowed for this media
+        type. The class names will be applied in addition to
+        left/inline/right and captioned class names.
+
+    type
+        This controls whether kupu inserts an img tag or an object
+        tag. Only images and flash objects are supported at this time.
+
 documentation tab
 =================
 

Modified: kupu/branch/duncan-flash/plone/kupu_plone_layer/kupucollection.xml.pt
==============================================================================
--- kupu/branch/duncan-flash/plone/kupu_plone_layer/kupucollection.xml.pt	(original)
+++ kupu/branch/duncan-flash/plone/kupu_plone_layer/kupucollection.xml.pt	Mon Apr 30 16:22:35 2007
@@ -37,6 +37,9 @@
                tal:content="info/url">URI</uri>
           <icon metal:define-slot="icon"
                 tal:content="info/icon">icon</icon>
+          <media tal:condition="info/media|nothing" tal:content="info/media">mime type</media>
+          <class tal:condition="info/classes|nothing" tal:repeat="c info/classes"
+                   tal:attributes="title c/title; name c/classname" />
           <size metal:define-slot="size"
                 tal:condition="info/size"
                 tal:content="info/size">size</size>

Modified: kupu/branch/duncan-flash/plone/librarytool.py
==============================================================================
--- kupu/branch/duncan-flash/plone/librarytool.py	(original)
+++ kupu/branch/duncan-flash/plone/librarytool.py	Mon Apr 30 16:22:35 2007
@@ -256,12 +256,17 @@
             if normal:
                 normal = Expression(normal)
             scalefield = a.get('scalefield', 'image')
+            classes = a.get('classes', '').split('\n')
+            mediatype = a.get('mediatype', 'image')
             if not portal_type:
                 continue
             action_map[portal_type] = {
                 'expression': Expression(preview),
                 'normal': normal,
-                'scalefield': scalefield, }
+                'scalefield': scalefield,
+                'classes': classes,
+                'mediatype': mediatype,
+            }
         self._preview_actions = action_map
 
     def deleteResourceTypes(self, resource_types):

Modified: kupu/branch/duncan-flash/plone/plonedrawers.py
==============================================================================
--- kupu/branch/duncan-flash/plone/plonedrawers.py	(original)
+++ kupu/branch/duncan-flash/plone/plonedrawers.py	Mon Apr 30 16:22:35 2007
@@ -207,7 +207,28 @@
         if type is None:
             return None
         return "%s/%s" % (self.base, type.getIcon())
-            
+
+    def media(self, portal_type):
+        """Get the media type to be included in the xml.
+        Since 'image' is the default we can omit it."""
+        media = self.tool.getMediaForType(portal_type)
+        if media=='image':
+            return None
+        return media
+
+    def classes(self, portal_type):
+        stored = self.tool.getClassesForType(portal_type)
+        classes = []
+        for c in stored:
+            c = c.strip()
+            if not c:
+                continue
+            if '|' in c:
+                title, classname = c.split('|', 1)
+                classes.append({'title': title, 'classname': classname})
+            else:
+                classes.append({'title': c, 'classname': c})
+        return classes
 
     def sizes(self, obj):
         """Returns size, width, height"""
@@ -312,6 +333,8 @@
                 normal = url
 
             sizes = self.get_image_sizes(obj, portal_type, url)
+            media = self.media(portal_type)
+            classes = self.classes(portal_type)
 
             icon = self.icon(portal_type)
             size, width, height = self.sizes(obj)
@@ -338,6 +361,8 @@
                 'height': height,
                 'preview': preview,
                 'sizes': sizes,
+                'media': media,
+                'classes': classes,
                 'title': title,
                 'description': description,
                 'linkable': linkable,
@@ -389,6 +414,8 @@
             normal = url
 
         sizes = self.get_image_sizes(brain, portal_type, url)
+        media = self.media(portal_type)
+        classes = self.classes(portal_type)
 
         icon = self.icon(portal_type)
         size, width, height = self.sizes(brain)
@@ -414,6 +441,8 @@
             'height': height,
             'preview': preview,
             'sizes': sizes,
+            'media': media,
+            'classes': classes,
             'title': title,
             'description': description,
             'linkable': linkable,

Modified: kupu/branch/duncan-flash/plone/plonelibrarytool.py
==============================================================================
--- kupu/branch/duncan-flash/plone/plonelibrarytool.py	(original)
+++ kupu/branch/duncan-flash/plone/plonelibrarytool.py	Mon Apr 30 16:22:35 2007
@@ -682,6 +682,17 @@
         value = action_map.get(portal_type, {}).get('scalefield', 'image')
         return value
 
+    security.declareProtected(permissions.ManageLibraries, "getClassesForType")
+    def getClassesForType(self, portal_type):
+        action_map = getattr(self, '_preview_actions', {})
+        return action_map.get(portal_type, {}).get('classes', ())
+
+    security.declareProtected(permissions.ManageLibraries, "getMediaForType")
+    def getMediaForType(self, portal_type):
+        action_map = getattr(self, '_preview_actions', {})
+        value = action_map.get(portal_type, {}).get('mediatype', 'image')
+        return value
+
     security.declareProtected(permissions.ManageLibraries, "set_html_exclusions")
     def set_html_exclusions(self, exclusions):
         """Set the html_exclusions.

Modified: kupu/branch/duncan-flash/plone/resource_types.pt
==============================================================================
--- kupu/branch/duncan-flash/plone/resource_types.pt	(original)
+++ kupu/branch/duncan-flash/plone/resource_types.pt	Mon Apr 30 16:22:35 2007
@@ -1,249 +1,285 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-    lang="en"
-    metal:use-macro="here/kupu_config/macros/master"
-    i18n:domain="kupuconfig">
-
-<body>
-
-    <div class="documentContent" metal:fill-slot="kupu_content">
-<h1 class="documentFirstHeading"
-    i18n:translate="heading_kupu_resource_types">Kupu Resource Types</h1>
-<form action="" method="post" tal:attributes="action here/absolute_url">
-<p i18n:translate="text_resource_types">While libraries provide abstract locations for objects of any type,
-Kupu distinguishes objects by resource type. For example, a user might
-request a library showing objects to link to or a library showing
-objects to be inserted into a document. The abstract location
-(library) might be the same, but the former library would contain
-documents, the latter images.</p>
-
-<p i18n:translate="text_resource_types2">This management screen allows you to define resource types using a
-list of portal types. A special resource type, <code>collection</code>,
-identifies portal types that are to be treated as collections.
-The resource type <code>containsanchors</code> is used to list types which
-may contain HTML anchors.</p>
-
-<p i18n:translate="text_resource_types3">Also on this screen are urls
-for each type which can be previewed as an image. The expression may
-use <code>object_url</code> and <code>portal_type</code>, but should
-not attempt to access the object directly. The resulting URL should
-ideally return an image no larger than 128 pixels square.</p>
-
-<fieldset tal:define="typestool context/portal_types;
-                typeinfos typestool/listTypeInfo;">
-<legend i18n:translate="legend_map_resource_types">Map resource types</legend>
-
-<table summary="Resource definitions" class="listing nosort">
-<thead>
-  <tr>
-    <th colspan="3">Map resource types</th>
-  </tr>
-</thead>
-
- <tal:loop tal:repeat="resource here/zmi_get_resourcetypes">
-<tbody
-  tal:define="oddrow repeat/resource/odd;name resource/name; types resource/types;"
-  tal:attributes="class python:test(oddrow, 'even', 'odd');"
-  align="left"
-  style="margin-top: 1em !important;"
->
-  <tr><td colspan="3">&nbsp;</td></tr>
-  <tr tal:condition="repeat/resource/end"><td style="border-right:none;"></td><td colspan="2"><em>use this entry to add a new resource</em>
-</td></tr>
-  <tr>
-    <td>
-      <input type="hidden" name="type_info.old_type:records"
-             tal:attributes="value name" />
-      <input type="checkbox" name="resource_types:list"
-             tal:condition="name"
-             tal:attributes="value name" />
-    </td>
-    <th>Resource</th>
-    <td>
-      <input type="text" name="type_info.resource_type:records"
-             tal:attributes="value name" />
-    </td>
-  </tr>
-  <tr>
-    <td></td>
-    <th>Portal Types</th>
-    <td>
-      <select name="type_info.portal_types:list:records" size="5" multiple
-          tal:attributes="size python:max(5,len(types));">
-          <tal:block repeat="ti typeinfos">
-            <option tal:define="title python:path('string:${ti/Title}' + test(ti.Title()==ti.getId(),'',' (${ti/getId})'));
-                        id ti/getId;
-                        selected python:id in types;"
-                    tal:content="title"
-                    tal:condition="selected"
-                    tal:attributes="value ti/getId;" selected></option>
-
-          </tal:block>
-          <tal:block repeat="ti typeinfos">
-            <option tal:define="title python:path('string:${ti/Title}' + test(ti.Title()==ti.getId(),'',' (${ti/getId})'));
-                        id ti/getId;
-                        selected python:id in types;"
-                    tal:content="title"
-                    tal:condition="not:selected"
-                    tal:attributes="value ti/getId;"></option>
-
-          </tal:block>
-      </select>
-    </td>
-  </tr>
-  <tr><td></td><th>New types</th>
-    <td>
-      <select name="type_info.newtypes:int:records" size="1"
-              tal:define="newtype python:context.getNewTypeHandler(name)">
-        <option value="0" tal:attributes="selected python:test(newtype==0,True,None)">are not added to selection</option>
-        <option value="1" tal:attributes="selected python:test(newtype==1,True,None)">are added to selection</option>
-      </select>
-    </td>
-  <tr><td colspan="3">&nbsp;</td></tr>
-</tbody>
- </tal:loop>
-<tbody>
-  <tr>
-    <td style="border-right:none;"></td>
-    <td colspan="2"><em>specify a resource type to be used for reference fields with an empty list of allowed types</em>
-    </td>
-  </tr>
-  <tr>
-    <td> </td>
-    <th>Default resource</th>
-    <td>
-      <select name="default_resource" tal:define="current here/getDefaultResource">
-        <tal:block repeat="resource here/zmi_get_resourcetypes">
-          <option tal:define="name resource/name;"
-                  tal:attributes="value resource/name;selected python:current==name;"
-                  tal:content="resource/name" />
-        </tal:block>
-      </select>
-    </td>
-  </tr>
-  <tr>
-    <td  style="border-right: none;">&nbsp;</td>
-    <td colspan="2" style="padding-top:0.5em;">
-      <input class="context" type="submit" name="zmi_update_resource_types:method" value="Save" i18n:attributes="value" />
-      <input class="context" type="submit" name="zmi_delete_resource_types:method" value="Delete" i18n:attributes="value" />
-    </td>
-  </tr>
-</tbody>
-</table>
-
-<table summary="Preview actions" class="listing nosort" width="90%"
- tal:define="typestool context/portal_types;
-             typeinfos typestool/listTypeInfo;
-             previewable python:[t for t in typeinfos if context.getPreviewForType(t.getId())];">
-<thead>
-  <tr>
-    <th colspan="4">Action URLs</th>
-  </tr>
-  <tr><th width="1%"></th>
-    <th width="1%">Type</th>
-    <th colspan="2">URL</th>
-  </tr>
-</thead>
-
- <tal:loop tal:repeat="ti previewable">
-<tbody  tal:define="oddrow repeat/ti/odd;
-                portal_type ti/getId;
-                previewaction python:context.getPreviewForType(portal_type);
-                normalaction python:context.getNormalViewForType(portal_type);
-                scalefield python:context.getScaleFieldForType(portal_type);"
-       tal:condition="python:context.getPreviewForType(portal_type)"
-  tal:attributes="class python:test(oddrow, 'even', 'odd');">
-  <tr>
-    <td rowspan="3">
-      <input type="hidden" name="preview_action.marker:records" value="x" />
-      <input type="hidden" name="preview_action.portal_type:records" tal:attributes="value ti/getId" />
-      <input type="checkbox" name="preview_types:list"
-             tal:attributes="value ti/getId" />
-    </td>
-    <td rowspan="3" tal:define="title python:path('string:${ti/Title}' + test(ti.Title()==ti.getId(),'',' (${ti/getId})'));"
-        tal:content="title">type</td>
-    <td style="border-right: none;" width="1%">preview</td>
-    <td>
-      <input type="text" name="preview_action.expression:records"
-             style="width:90%"
-             tal:attributes="value previewaction" />
-    </td>
-  </tr>
-  <tr>
-    <td style="border-right: none;" width="1%">Normal&nbsp;mage</td>
-    <td>
-      <input type="text" name="preview_action.normal:records"
-             style="width:90%"
-             tal:attributes="value normalaction" />
-    </td>
-  </tr>
-  <tr>
-    <td style="border-right: none;" width="1%">fieldname</td>
-    <td>
-      <input type="text" name="preview_action.scalefield:records"
-             style="width:90%"
-             tal:attributes="value scalefield" />
-    </td>
-  </tr>
-</tbody>
- </tal:loop>
-<tbody  tal:define="oddrow python:len(previewable)%2;"
-        tal:attributes="class python:test(oddrow, 'even', 'odd');">
-  <tr>
-    <td rowspan="3">
-      <input type="hidden" name="preview_action.marker:records" value="-"/>
-    </td>
-    <td rowspan="3">
-      <select name="preview_action.portal_type:records">
-          <option i18n:translate="" value="">(select type)</option>
-          <tal:block repeat="ti typeinfos">
-            <option tal:define="title python:path('string:${ti/Title}' + test(ti.Title()==ti.getId(),'',' (${ti/getId})'));
-                        id ti/getId;"
-                    tal:content="title"
-                    tal:condition="not:python:context.getPreviewForType(id)"
-                    tal:attributes="value ti/getId;"></option>
-          </tal:block>
-      </select>
-    <td style="border-right: none;" width="1%">preview</td>
-    <td>
-      <input type="text" name="preview_action.expression:records"
-             style="width:90%" value="" />
-    </td>
-  </tr>
-  <tr>
-    <td style="border-right: none;" width="1%">Normal Image</td>
-    <td>
-      <input type="text" name="preview_action.normal:records"
-             style="width:90%" value="" />
-    </td>
-  </tr>
-  <tr>
-    <td style="border-right: none;" width="1%">fieldname</td>
-    <td>
-      <input type="text" name="preview_action.scalefield:records"
-             style="width:90%" value="image" />
-    </td>
-  </tr>
-</tbody>
-<tbody>
-  <tr>
-    <td style="border-right: none;">&nbsp;</td>
-    <td style="padding-top:0.5em;">
-      <input class="context" type="submit" name="zmi_update_resource_types:method" value="Save" i18n:attributes="value" />
-      <input class="context" type="submit" name="zmi_delete_resource_types:method" value="Delete" i18n:attributes="value" />
-    </td>
-    <td colspan="2"><em>Preview is an expression to use for the preview image in the drawer [default is no preview].
-      Normal image is an expression to use for the normal view of a mediaobject [string:$object_url].
-      Fieldname is the name of the field to use for scaled variants of the mediaobject [image].
-      </em>
-    </td>
-  </tr>
-</tbody>
-</table>
-
-</fieldset>
-</form>
-</div>
-</body>
+lang="en"
+metal:use-macro="here/kupu_config/macros/master"
+i18n:domain="kupuconfig">
+
+   <body>
+      <div class="documentContent" metal:fill-slot="kupu_content">
+         <h1 class="documentFirstHeading"
+             i18n:translate="heading_kupu_resource_types">Kupu Resource Types</h1>
+         <form action="" method="post" tal:attributes="action here/absolute_url"
+               tal:define="typestool context/portal_types;
+               typeinfos typestool/listTypeInfo;
+               typeinfos python:[(ti.Title(), ti.getId()) for ti in typeinfos];
+               dummy python:typeinfos.sort()">
+            <p i18n:translate="text_resource_types">While libraries provide abstract locations for objects of any type,
+               Kupu distinguishes objects by resource type. For example, a user might
+               request a library showing objects to link to or a library showing
+               objects to be inserted into a document. The abstract location
+               (library) might be the same, but the former library would contain
+               documents, the latter images.</p>
+            <p i18n:translate="text_resource_types2">This management screen allows you to define resource types using a
+               list of portal types. A special resource type, <code>collection</code>,
+               identifies portal types that are to be treated as collections.
+               The resource type <code>containsanchors</code> is used to list types which
+               may contain HTML anchors.</p>
+
+            <p i18n:translate="text_resource_types3">Also on this screen are urls
+               for each type which can be previewed as an image. The expression may
+               use <code>object_url</code> and <code>portal_type</code>, but should
+               not attempt to access the object directly. The resulting URL should
+               ideally return an image no larger than 128 pixels square.</p>
+
+            <fieldset>
+               <legend i18n:translate="legend_map_resource_types">Map resource types</legend>
+
+               <table summary="Resource definitions" class="listing nosort">
+                  <thead>
+                     <tr>
+                        <th colspan="3">Map resource types</th>
+                     </tr>
+                  </thead>
+
+                  <tal:loop tal:repeat="resource here/zmi_get_resourcetypes">
+                     <tbody
+                           tal:define="oddrow repeat/resource/odd;name resource/name; types resource/types;"
+                           tal:attributes="class python:test(oddrow, 'even', 'odd');"
+                           align="left"
+                           style="margin-top: 1em !important;"
+                           >
+                        <tr><td colspan="3">&nbsp;</td></tr>
+                        <tr tal:condition="repeat/resource/end"><td style="border-right:none;"></td><td colspan="2"><em>use this entry to add a new resource</em>
+                           </td></tr>
+                        <tr>
+                           <td>
+                              <input type="hidden" name="type_info.old_type:records"
+                                     tal:attributes="value name" />
+                              <input type="checkbox" name="resource_types:list"
+                                     tal:condition="name"
+                                     tal:attributes="value name" />
+                           </td>
+                           <th>Resource</th>
+                           <td>
+                              <input type="text" name="type_info.resource_type:records"
+                                     tal:attributes="value name" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td></td>
+                           <th>Portal Types</th>
+                           <td>
+                              <select name="type_info.portal_types:list:records" size="5" multiple
+                                      tal:attributes="size python:max(5,len(types));">
+                                 <tal:block repeat="ti typeinfos">
+                                    <option tal:define="title python:ti[0]; id python:ti[1];
+                                            fulltitle python:title + test(title==id,'',' (%s)'%id);
+                                            selected python:id in types;"
+                                            tal:content="fulltitle"
+                                            tal:condition="selected"
+                                            tal:attributes="value id;" selected></option>
+                                 </tal:block>
+                                 <tal:block repeat="ti typeinfos">
+                                    <option tal:define="title python:ti[0]; id python:ti[1];
+                                            fulltitle python:title + test(title==id,'',' (%s)'%id);
+                                            selected python:id in types;"
+                                            tal:content="fulltitle"
+                                            tal:condition="not:selected"
+                                            tal:attributes="value id;"></option>
+                                 </tal:block>
+                              </select>
+                           </td>
+                        </tr>
+                        <tr><td></td><th>New types</th>
+                           <td>
+                              <select name="type_info.newtypes:int:records" size="1"
+                                      tal:define="newtype python:context.getNewTypeHandler(name)">
+                                 <option value="0" tal:attributes="selected python:test(newtype==0,True,None)">are not added to selection</option>
+                                 <option value="1" tal:attributes="selected python:test(newtype==1,True,None)">are added to selection</option>
+                              </select>
+                           </td>
+                           <tr><td colspan="3">&nbsp;</td></tr>
+                     </tbody>
+                  </tal:loop>
+                  <tbody>
+                     <tr>
+                        <td style="border-right:none;"></td>
+                        <td colspan="2"><em>specify a resource type to be used for reference fields with an empty list of allowed types</em>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td> </td>
+                        <th>Default resource</th>
+                        <td>
+                           <select name="default_resource" tal:define="current here/getDefaultResource">
+                              <tal:block repeat="resource here/zmi_get_resourcetypes">
+                                 <option tal:define="name resource/name;"
+                                         tal:attributes="value resource/name;selected python:current==name;"
+                                         tal:content="resource/name" />
+                              </tal:block>
+                           </select>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td  style="border-right: none;">&nbsp;</td>
+                        <td colspan="2" style="padding-top:0.5em;">
+                           <input class="context" type="submit" name="zmi_update_resource_types:method" value="Save" i18n:attributes="value" />
+                           <input class="context" type="submit" name="zmi_delete_resource_types:method" value="Delete" i18n:attributes="value" />
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+
+               <table summary="Preview actions" class="listing nosort" width="90%"
+                      tal:define="previewable python:[(title,id) for (title,id) in typeinfos if context.getPreviewForType(id)];">
+                  <thead>
+                     <tr>
+                        <th colspan="4">Action URLs</th>
+                     </tr>
+                     <tr><th width="1%"></th>
+                        <th width="1%">Type</th>
+                        <th colspan="2">URL</th>
+                     </tr>
+                  </thead>
+
+                  <tal:loop tal:repeat="ti previewable">
+                     <tbody  tal:define="title python:ti[0];id python:ti[1];oddrow repeat/ti/odd;
+                             fulltitle python:title + test(title==id,'',' (%s)'%id);
+                             portal_type id;
+                             previewaction python:context.getPreviewForType(portal_type);
+                             normalaction python:context.getNormalViewForType(portal_type);
+                             scalefield python:context.getScaleFieldForType(portal_type);
+                             classes python:context.getClassesForType(portal_type);
+                             mediatype python:context.getMediaForType(portal_type);"
+                             tal:condition="python:context.getPreviewForType(portal_type)"
+                             tal:attributes="class python:test(oddrow, 'even', 'odd');">
+                        <tr>
+                           <td rowspan="5">
+                              <input type="hidden" name="preview_action.marker:records" value="x" />
+                              <input type="hidden" name="preview_action.portal_type:records" tal:attributes="value id" />
+                              <input type="checkbox" name="preview_types:list"
+                                     tal:attributes="value id" />
+                           </td>
+                           <td rowspan="5" tal:content="fulltitle">type</td>
+                           <td style="border-right: none;" width="1%">preview</td>
+                           <td>
+                              <input type="text" name="preview_action.expression:records"
+                                     style="width:90%"
+                                     tal:attributes="value previewaction" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">Normal&nbsp;image</td>
+                           <td>
+                              <input type="text" name="preview_action.normal:records"
+                                     style="width:90%"
+                                     tal:attributes="value normalaction" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">fieldname</td>
+                           <td>
+                              <input type="text" name="preview_action.scalefield:records"
+                                     style="width:90%"
+                                     tal:attributes="value scalefield" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">classes</td>
+                           <td>
+                              <textarea name="preview_action.classes:records"
+                                     style="width:90%"
+                                     tal:content="python:'\n'.join(classes)" />
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">type</td>
+                           <td>
+                              <select name="preview_action.mediatype:records" size="1">
+                                 <option value="image" tal:attributes="selected python:mediatype=='image'">Image</option>
+                                 <option value="flash" tal:attributes="selected python:mediatype=='flash'">Flash</option>
+                              </select>
+                              <div style="height:1em;">&nbsp;</div>
+                           </td>
+                        </tr>
+                     </tbody>
+                  </tal:loop>
+                  <tbody  tal:define="oddrow python:len(previewable)%2;"
+                          tal:attributes="class python:test(oddrow, 'even', 'odd');">
+                     <tr>
+                        <td rowspan="5">
+                           <input type="hidden" name="preview_action.marker:records" value="-"/>
+                        </td>
+                        <td rowspan="5">
+                           <select name="preview_action.portal_type:records" style="width:15em">
+                              <option i18n:translate="" value="">(select type)</option>
+                              <tal:block repeat="ti typeinfos">
+                                    <option tal:define="title python:ti[0]; id python:ti[1];
+                                            fulltitle python:title + test(title==id,'',' (%s)'%id);"
+                                            tal:content="fulltitle"
+                                            tal:condition="not:python:context.getPreviewForType(id)"
+                                            tal:attributes="value id;"></option>
+                              </tal:block>
+                           </select>
+                           <td style="border-right: none;" width="1%">preview</td>
+                           <td>
+                              <input type="text" name="preview_action.expression:records"
+                                     style="width:90%" value="" />
+                           </td>
+                     </tr>
+                     <tr>
+                        <td style="border-right: none;" width="1%">Normal&nbsp;image</td>
+                        <td>
+                           <input type="text" name="preview_action.normal:records"
+                                  style="width:90%" value="" />
+                        </td>
+                     </tr>
+                     <tr>
+                        <td style="border-right: none;" width="1%">fieldname</td>
+                        <td>
+                           <input type="text" name="preview_action.scalefield:records"
+                                  style="width:90%" value="image" />
+                        </td>
+                     </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">classes</td>
+                           <td>
+                              <textarea type="text" name="preview_action.classes:records"
+                                     style="width:90%"></textarea>
+                           </td>
+                        </tr>
+                        <tr>
+                           <td style="border-right: none;" width="1%">type</td>
+                           <td>
+                              <select name="preview_action.mediatype:records" size="1">
+                                 <option value="image" selected>Image</option>
+                                 <option value="flash">Flash</option>
+                              </select>
+                           </td>
+                        </tr>
+                  </tbody>
+                  <tbody>
+                     <tr>
+                        <td style="border-right: none;">&nbsp;</td>
+                        <td style="padding-top:0.5em;" colspan="3">
+                           <input class="context" type="submit" name="zmi_update_resource_types:method" value="Save" i18n:attributes="value" />
+                           <input class="context" type="submit" name="zmi_delete_resource_types:method" value="Delete" i18n:attributes="value" />
+                        </td>
+                     </tr>
+                     <tr>
+                        <td colspan="4">
+                           <em><code>Preview</code> is an expression to use for the preview image in the drawer [default is no preview].
+                           <code>Normal image</code> is an expression to use for the normal view of a mediaobject [string:$object_url].
+                           <code>Fieldname</code> is the name of the field to use for scaled variants of the mediaobject [image].
+                           <code>Classes</code> is a list of classnames which may be selected when inserting the object as media.
+                           <code>Type</code> controls whether kupu inserts an img tag or an object tag to embed flash.
+                           </em>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+
+            </fieldset>
+         </form>
+      </div>
+   </body>
 </html>
-
-

From duncan at codespeak.net  Mon Apr 30 16:35:24 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 30 Apr 2007 16:35:24 +0200 (CEST)
Subject: [kupu-checkins] r42488 - kupu/trunk/kupu/common/kupudrawers
Message-ID: <20070430143524.36FBB8075@code0.codespeak.net>

Author: duncan
Date: Mon Apr 30 16:35:23 2007
New Revision: 42488

Modified:
   kupu/trunk/kupu/common/kupudrawers/drawer.xsl
Log:
Removed most of the illegal forms from drawer.xsl. Hopefully this will stop IE6 crashing.
(Left in the image upload form as that actually gets submitted. It needs fixing also, but that will be harder).

Modified: kupu/trunk/kupu/common/kupudrawers/drawer.xsl
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers/drawer.xsl	(original)
+++ kupu/trunk/kupu/common/kupudrawers/drawer.xsl	Mon Apr 30 16:35:23 2007
@@ -299,25 +299,28 @@
     <xsl:template match="resource|collection" mode="image-properties">
         <xsl:apply-templates select="." mode="base-properties"/>
         <div>
-            <form onsubmit="return false;">
+           <!-- <form onsubmit="return false;"> -->
                 <div>
                     <label style="display: block;margin-top: 1em;">Image alignment</label>
                     <input type="radio" name="image-align" id="image-align-left" value="image-left">
+                       <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
                         <xsl:if test="$image-align='left'">
                             <xsl:attribute name="checked">checked</xsl:attribute>
                         </xsl:if>
                     </input>
                     <label for="image-align-left" i18n:translate="imagedrawer_left">Left</label>
                     <input type="radio" name="image-align" id="image-align-inline" value="image-inline">
-                        <xsl:if test="$image-align='inline'">
-                            <xsl:attribute name="checked">checked</xsl:attribute>
-                        </xsl:if>
+                       <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                       <xsl:if test="$image-align='inline'">
+                          <xsl:attribute name="checked">checked</xsl:attribute>
+                       </xsl:if>
                     </input>
                     <label for="image-align-inline" i18n:translate="imagedrawer_inline">Inline</label>
                     <input type="radio" name="image-align" id="image-align-right" value="image-right">
-                        <xsl:if test="$image-align='right'">
-                            <xsl:attribute name="checked">checked</xsl:attribute>
-                        </xsl:if>
+                       <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                       <xsl:if test="$image-align='right'">
+                          <xsl:attribute name="checked">checked</xsl:attribute>
+                       </xsl:if>
                     </input>
                     <label for="image-align-right" i18n:translate="imagedrawer_right">Right</label>
                     <div class="discreet" i18n:translate="imagedrawer_image_align_explanation">
@@ -329,11 +332,12 @@
                 <xsl:if test="$usecaptions='yes'">
                     <div>
                         <input type="checkbox" name="image-caption" id="image-caption">
-                            <xsl:if test="$image-caption='true'">
-                                <xsl:attribute name="checked">checked</xsl:attribute>
-                            </xsl:if>
-                            <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
-                            this.checked?'none':'';</xsl:attribute>
+                           <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                           <xsl:if test="$image-caption='true'">
+                              <xsl:attribute name="checked">checked</xsl:attribute>
+                           </xsl:if>
+                           <xsl:attribute name="onclick">document.getElementById('image_alt_div').style.display =
+                              this.checked?'none':'';</xsl:attribute>
                         </input>
                         <label for="image-caption" i18n:translate="imagedrawer_caption_label">Caption</label>
                     </div>
@@ -352,9 +356,10 @@
                      </xsl:if>   
                     <label for="image_alt" i18n:translate="imagedrawer_upload_alt_text">"alt" attribute text</label>
                     <input type="text" id="image_alt" size="20" value="{title}">
+                       <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
                     </input>
                 </div>
-            </form>
+                <!-- </form> -->
         </div>
     </xsl:template>
     <xsl:template match="size">
@@ -374,19 +379,25 @@
     <xsl:template match="resource|collection" mode="link-properties">
         <xsl:apply-templates select="." mode="base-properties"/>
         
-        <form onsubmit="return false;">
+        <!-- <form onsubmit="return false;"> -->
             <div class="kupu-linkdrawer-name-row">
                 <div><label i18n:translate="linkdrawer_name_label">Name</label></div>
-                <input type="text" id="link_name" size="10"><xsl:attribute name="value"><xsl:value-of select="$link_name"/></xsl:attribute></input>
+                <input type="text" id="link_name" size="10">
+                   <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                   <xsl:attribute name="value"><xsl:value-of select="$link_name"/></xsl:attribute>
+                </input>
             </div>
             <div class="kupu-linkdrawer-target-row">
                 <div><label i18n:translate="linkdrawer_target_label">Target</label></div>
-                <input type="text" id="link_target" size="10"><xsl:attribute name="value"><xsl:value-of select="$link_target"/></xsl:attribute></input>
+                <input type="text" id="link_target" size="10">
+                   <xsl:attribute name="onkeypress">if(event.keyCode==13)return false;</xsl:attribute>
+                   <xsl:attribute name="value"><xsl:value-of select="$link_target"/></xsl:attribute>
+                </input>
             </div>
             <xsl:if test="$showanchors='yes'">
                 <xsl:apply-templates select="anchor"></xsl:apply-templates>
             </xsl:if>
-        </form>
+        <!-- </form> -->
     </xsl:template>
     
     <xsl:template match="resource|collection" mode="properties">

From duncan at codespeak.net  Mon Apr 30 16:45:49 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 30 Apr 2007 16:45:49 +0200 (CEST)
Subject: [kupu-checkins] r42489 - kupu/trunk/kupu/plone/kupu_plone_layer
Message-ID: <20070430144549.25DA38075@code0.codespeak.net>

Author: duncan
Date: Mon Apr 30 16:45:48 2007
New Revision: 42489

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Built kupu template

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Mon Apr 30 16:45:48 2007
@@ -16,18 +16,18 @@
     <!--$Id: toolboxes.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
     <!--$Id: colorchooser.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id: save.kupu 9520 2005-02-26 16:30:23Z duncan $-->
-    <!--$Id: drawers.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
-    <!--$Id: include.kupu 35491 2006-12-08 15:41:49Z duncan $-->
+    <!--$Id: drawers.kupu 41836 2007-04-03 08:36:10Z duncan $-->
+    <!--$Id: include.kupu 39202 2007-02-19 12:06:45Z duncan $-->
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
     <!--$Id: head.kupu 34332 2006-11-07 14:50:40Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
-    <!--$Id: body.kupu 39156 2007-02-18 14:13:16Z duncan $-->
+    <!--$Id: body.kupu 42388 2007-04-28 10:29:22Z limi $-->
     <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
     <!--$Id: sourceedit.kupu 35477 2006-12-08 13:20:38Z duncan $-->
-    <!--$Id: wysiwyg_support.kupu 39157 2007-02-18 14:29:58Z duncan $-->
+    <!--$Id: wysiwyg_support.kupu 42388 2007-04-28 10:29:22Z limi $-->
     
 
     <div xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal" metal:define-macro="wysiwygEditorBox" id="kupu-editor" tal:define="name fieldName|inputname;                 editorid string:kupu-editor-${name}" tal:attributes="id editorid">
@@ -436,70 +436,18 @@
     </table>
   <script type="text/javascript">var focuscount = 0;</script>
     <div>
-    <iframe class="kupu-editor-iframe" 
-            frameborder="0" 
-            src="emptypage" 
-            onfocus="this.contentWindow.focus();" 
-            tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True);
-                        base kupu_base_override|base;" 
-            tal:attributes="src string:${base}/emptypage;
-                            id string:kupu-editor-iframe-${fname};
-                            name string:kupu-editor-iframe-${fname};">
+    <iframe class="kupu-editor-iframe" frameborder="0" src="emptypage" onfocus="this.contentWindow.focus();" tal:define="base python:here.kupu_library_tool.getBaseUrl(here, True);                     base kupu_base_override|base;" tal:attributes="src string:${base}/emptypage;                         id string:kupu-editor-iframe-${fname};                         name string:kupu-editor-iframe-${fname};">
     </iframe>
-     <input type="hidden" 
-            name="text_format:default" 
-            value="text/html" 
-            tal:define="fieldName fieldName|inputname|nothing;
-                        val python:fieldName and 'text/html' or 'html';
-                        fieldName python:test(fieldName, fieldName+'_', '') + 'text_format:default';" 
-            tal:attributes="name fieldName;value val;" 
-            />
+     <input type="hidden" name="text_format:default" value="text/html" tal:define="fieldName fieldName|inputname|nothing;                 val python:fieldName and 'text/html' or 'html';                 fieldName python:test(fieldName, fieldName+'_', '') + 'text_format:default';" tal:attributes="name fieldName;value val;"/>
 <tal:test condition="fieldName|nothing">
-    <textarea cols="80" 
-              rows="25" 
-              class="kupu-editor-textarea" 
-              name="description" 
-              tal:condition="fieldName|nothing" 
-              tal:define="global kupu_content python:here.convertContentForKupu(fieldName, inputvalue);"
-              tal:content="kupu_content"
-              tal:attributes="name inputname;
-                              onfocus onfocus|nothing;
-                              onblur onblur|nothing;
-                              rows rows|default;
-                              cols cols|default;">
+    <textarea cols="80" rows="25" class="kupu-editor-textarea" name="description" tal:condition="fieldName|nothing" tal:define="global kupu_content python:here.convertContentForKupu(fieldName, inputvalue);" tal:content="kupu_content" tal:attributes="name inputname;                         onfocus onfocus|nothing;                         onblur onblur|nothing;                         rows rows|default;                         cols cols|default;">
     </textarea>
 </tal:test>
-    <textarea cols="80" 
-              rows="25" 
-              class="kupu-editor-textarea" 
-              name="description" 
-              id="kupu-editor-textarea" 
-              tal:define="pss modules/Products/PythonScripts/standard;
-                          text_format text_format | python: getattr(here,'text_format','html');
-                          is_stx python:text_format=='structured-text';
-                          is_ptx python:text_format=='plain';"
-              tal:condition="not:fieldName|nothing" 
-              tal:content="python:(is_stx and pss.structured_text(inputvalue))
-                                           or (is_ptx and pss.newline_to_br(inputvalue))
-                                           or inputvalue" 
-              tal:attributes="name inputname;
-                                   onfocus onfocus|nothing;
-                                   onblur onblur|nothing;
-                                   rows rows|default;
-                                   cols cols|default;">
+    <textarea cols="80" rows="25" class="kupu-editor-textarea" name="description" id="kupu-editor-textarea" tal:define="pss modules/Products/PythonScripts/standard;                 text_format text_format | python: getattr(here,'text_format','html');                 is_stx python:text_format=='structured-text';                 is_ptx python:text_format=='plain';" tal:condition="not:fieldName|nothing" tal:content="python:(is_stx and pss.structured_text(inputvalue))                                     or (is_ptx and pss.newline_to_br(inputvalue))                                     or inputvalue" tal:attributes="name inputname;                         onfocus onfocus|nothing;                         onblur onblur|nothing;                         rows rows|default;                         cols cols|default;">
     </textarea>
     </div>
   
-    <div class="kupuoverride" 
-         tal:condition="python:exists('kupu_content') and len(kupu_content)==0" 
-         tal:define="floated widget/allow_file_upload | python:1;" 
-         tal:attributes="style python:test(floated, 'float:left;;', '');">
-         <span class="discreet">
-             <a class="forcekupu" 
-                href="#" 
-                i18n:translate="suppress-kupu" 
-                tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName};" 
-                title="Reload current page without visual editor">
+    <div class="kupuoverride" tal:condition="python:exists('kupu_content') and len(kupu_content)==0" tal:define="floated widget/allow_file_upload | python:1;" tal:attributes="style python:test(floated, 'float:left;;', '');"><span class="discreet"><a class="forcekupu" href="#" i18n:translate="suppress-kupu" tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName};" title="reload current page without kupu">
          Edit without visual editor
       </a></span>
     </div>
@@ -518,16 +466,7 @@
     <link href="kupudrawerstyles.css" rel="stylesheet" type="text/css" tal:attributes="href string:${portal_url}/kupudrawerstyles.css"/>
    </tal:test>
   
-    <textarea cols="80" 
-              rows="25" 
-              name="fieldName" 
-              tal:content="inputvalue" 
-              tal:attributes="name fieldName|inputname;
-                              id fieldName|inputname;
-                              onfocus onfocus|nothing;
-                              onblur onblur|nothing;
-                              rows rows|default;
-                              cols cols|default;">
+    <textarea cols="80" rows="25" name="fieldName" tal:content="inputvalue" tal:attributes="name fieldName|inputname;                         id fieldName|inputname;                         onfocus onfocus|nothing;                         onblur onblur|nothing;                         rows rows|default;                         cols cols|default;">
     </textarea>
   
     <tal:archetypes tal:condition="fieldName|nothing">
@@ -562,31 +501,13 @@
        Text and type the document as you usually do.
      </div>
 
-     <input class="noborder" 
-            type="radio" 
-            name="text_format" 
-            value="structured-text" 
-            id="cb_structuredtext" 
-            tal:attributes="checked python:test(text_format=='structured-text', 1, None);"
-            />
+     <input class="noborder" type="radio" name="text_format" value="structured-text" id="cb_structuredtext" tal:attributes="checked python:test(text_format=='structured-text', 1, None);"/>
      <label for="cb_structuredtext" i18n:translate="structured_text">Structured Text</label> <br/>
 
-     <input class="noborder" 
-            type="radio" 
-            name="text_format" 
-            value="html" 
-            id="cb_html" 
-            tal:attributes="checked python:test(text_format=='html', 1, None);"
-            />
+     <input class="noborder" type="radio" name="text_format" value="html" id="cb_html" tal:attributes="checked python:test(text_format=='html', 1, None);"/>
      <label for="cb_html" i18n:translate="html">HTML</label> <br/>
 
-     <input class="noborder" 
-            type="radio" 
-            name="text_format" 
-            value="plain" 
-            id="cb_plain" 
-            tal:attributes="checked python:test(text_format=='plain', 1, None);"
-            />
+     <input class="noborder" type="radio" name="text_format" value="plain" id="cb_plain" tal:attributes="checked python:test(text_format=='plain', 1, None);"/>
      <label for="cb_plain" i18n:translate="plain_text">Plain Text</label>
     </tal:nonat>
   </tal:noeditor>

From duncan at codespeak.net  Mon Apr 30 16:46:57 2007
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Mon, 30 Apr 2007 16:46:57 +0200 (CEST)
Subject: [kupu-checkins] r42490 - kupu/tag/kupu-1.4b6
Message-ID: <20070430144657.BBBC38075@code0.codespeak.net>

Author: duncan
Date: Mon Apr 30 16:46:57 2007
New Revision: 42490

Added:
   kupu/tag/kupu-1.4b6/
      - copied from r42489, kupu/trunk/kupu/
Log:
Tag a new kupu beta for Plone 3 beta 2.