From hannosch at codespeak.net  Tue Oct  6 21:18:39 2009
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Tue,  6 Oct 2009 21:18:39 +0200 (CEST)
Subject: [kupu-checkins] r68218 - in kupu/trunk/kupu: doc plone
	plone/profiles/default
Message-ID: <20091006191839.24D1C168429@codespeak.net>

Author: hannosch
Date: Tue Oct  6 21:18:37 2009
New Revision: 68218

Removed:
   kupu/trunk/kupu/plone/profiles/default/export_steps.xml
   kupu/trunk/kupu/plone/profiles/default/import_steps.xml
Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/configure.zcml
Log:
Converted GenericSetup import and export step registrations to ZCML.


Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Tue Oct  6 21:18:37 2009
@@ -4,6 +4,8 @@
 
 - 1.4.16
 
+  - Converted GenericSetup import and export step registrations to ZCML.
+
   - Added icon_expr to the Plone configlet action registration, for
     forward-compatibility with Plone 4.
 

Modified: kupu/trunk/kupu/plone/configure.zcml
==============================================================================
--- kupu/trunk/kupu/plone/configure.zcml	(original)
+++ kupu/trunk/kupu/plone/configure.zcml	Tue Oct  6 21:18:37 2009
@@ -1,15 +1,35 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:five="http://namespaces.zope.org/five"
+           xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
            xmlns:zcml="http://namespaces.zope.org/zcml">
 
   <include package=".browser" />
 
-  <adapter
-      zcml:condition="installed Products.GenericSetup"
-      factory=".exportimport"
-      provides="Products.GenericSetup.interfaces.IBody"
-      for=".interfaces.IPloneKupuLibraryTool
-           Products.GenericSetup.interfaces.ISetupEnviron"
-      />
+  <configure zcml:condition="installed Products.GenericSetup">
+
+    <adapter
+        factory=".exportimport"
+        provides="Products.GenericSetup.interfaces.IBody"
+        for=".interfaces.IPloneKupuLibraryTool
+             Products.GenericSetup.interfaces.ISetupEnviron"
+        />
+
+    <genericsetup:exportStep
+        name="kupu-setup"
+        title="Kupu Settings"
+        description="Export Kupu settings"
+        handler="Products.kupu.plone.exportimport.exportKupuSettings"
+        />
+
+    <genericsetup:importStep
+        name="kupu-setup"
+        title="Kupu Settings"
+        description="Import Kupu settings"
+        handler="Products.kupu.plone.exportimport.importKupuSettings">
+      <depends name="toolset"/>
+      <depends name="typeinfo"/>
+    </genericsetup:importStep>
+
+  </configure>
 
 </configure>

Deleted: /kupu/trunk/kupu/plone/profiles/default/export_steps.xml
==============================================================================
--- /kupu/trunk/kupu/plone/profiles/default/export_steps.xml	Tue Oct  6 21:18:37 2009
+++ (empty file)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<export-steps>
- <export-step id="kupu-setup" version="20061211-01"
-              handler="Products.kupu.plone.exportimport.exportKupuSettings"
-              title="Kupu Settings">
-  Export Kupu settings
- </export-step>
-</export-steps>

Deleted: /kupu/trunk/kupu/plone/profiles/default/import_steps.xml
==============================================================================
--- /kupu/trunk/kupu/plone/profiles/default/import_steps.xml	Tue Oct  6 21:18:37 2009
+++ (empty file)
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<import-steps>
- <import-step id="kupu-setup" version="20061211-01"
-              handler="Products.kupu.plone.exportimport.importKupuSettings"
-              title="Kupu Settings">
-    <dependency step="plone_various"/>
-  Import Kupu settings
- </import-step>
-</import-steps>

From davisagli at codespeak.net  Wed Oct 14 09:30:25 2009
From: davisagli at codespeak.net (davisagli at codespeak.net)
Date: Wed, 14 Oct 2009 09:30:25 +0200 (CEST)
Subject: [kupu-checkins] r68416 - in kupu/trunk/kupu: Extensions doc
	plone/profiles/default
Message-ID: <20091014073025.31011168013@codespeak.net>

Author: davisagli
Date: Wed Oct 14 09:30:24 2009
New Revision: 68416

Added:
   kupu/trunk/kupu/plone/profiles/default/propertiestool.xml   (contents, props changed)
Modified:
   kupu/trunk/kupu/Extensions/Install.py
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
manage the kupu entry in the available_editors property on install/uninstall

Modified: kupu/trunk/kupu/Extensions/Install.py
==============================================================================
--- kupu/trunk/kupu/Extensions/Install.py	(original)
+++ kupu/trunk/kupu/Extensions/Install.py	Wed Oct 14 09:30:24 2009
@@ -20,13 +20,11 @@
 
 from App.Common import package_home
 
-from Products.CMFCore.utils import getToolByName, minimalpath
-from Products.CMFCore.DirectoryView import createDirectoryView
+from Products.CMFCore.utils import getToolByName
 from Products.kupu import kupu_globals
 from Products.kupu.plone.util import register_layer, unregister_layers
 from Products.kupu.plone import util
 from Products.kupu.config import TOOLNAME, PROJECTNAME, TOOLTITLE
-from OFS.ObjectManager import BadRequestException
 from zExceptions import BadRequest
 
 try:
@@ -273,6 +271,17 @@
         configTool.unregisterConfiglet('kupu')
         out.write('Removed kupu configlet\n')
 
+    # remove from list of available editors
+    portal_props = getToolByName(self, 'portal_properties')
+    site_props = getattr(portal_props,'site_properties', None)
+    attrname = 'available_editors'
+    if site_props is not None:
+        editors = list(site_props.getProperty(attrname)) 
+        if 'Kupu' in editors:
+            editors.remove('Kupu')
+            site_props._updateProperty(attrname, editors)        
+            print >>out, "Removed 'Kupu' from available editors in Plone."
+
     uninstall_transform(self, out)
     uninstall_tool(self, out)
     uninstall_resources(self, out)

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Wed Oct 14 09:30:24 2009
@@ -4,6 +4,11 @@
 
 - 1.4.16
 
+  - Remove Kupu from the available editors list on uninstall.
+
+  - Add Kupu to the available editors list when installed via the
+    GenericSetup profile.
+
   - Converted GenericSetup import and export step registrations to ZCML.
 
   - Added icon_expr to the Plone configlet action registration, for

Added: kupu/trunk/kupu/plone/profiles/default/propertiestool.xml
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/profiles/default/propertiestool.xml	Wed Oct 14 09:30:24 2009
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<object name="portal_properties" meta_type="Plone Properties Tool">
+ <object name="site_properties" meta_type="Plone Property Sheet">
+  <property name="available_editors" type="lines" purge="False">
+   <element value="Kupu"/>
+  </property>
+ </object>
+</object>

From davisagli at codespeak.net  Wed Oct 14 09:48:09 2009
From: davisagli at codespeak.net (davisagli at codespeak.net)
Date: Wed, 14 Oct 2009 09:48:09 +0200 (CEST)
Subject: [kupu-checkins] r68418 - in kupu/trunk/kupu: doc plone
Message-ID: <20091014074809.5CD94168013@codespeak.net>

Author: davisagli
Date: Wed Oct 14 09:48:08 2009
New Revision: 68418

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
respect Plone 4's default_editor property

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Wed Oct 14 09:48:08 2009
@@ -4,6 +4,9 @@
 
 - 1.4.16
 
+  - Updated getWysiwygmacros to respect Plone 4's default_editor property
+    and check for the non-rich wysiwyg_support in the archetypes skin layer.
+
   - Remove Kupu from the available editors list on uninstall.
 
   - Add Kupu to the available editors list when installed via the

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Wed Oct 14 09:48:08 2009
@@ -381,6 +381,15 @@
         pm = getToolByName(self, 'portal_membership')
         user = pm.getAuthenticatedMember()
         editor = user.getProperty('wysiwyg_editor', '')
+        
+        if not editor:
+            ptool = getToolByName(self, 'portal_properties')
+            site_props = getattr(ptool, 'site_properties', None)
+            if site_props is not None:
+                default_editor = site_props.getProperty('default_editor', '')
+                if default_editor:
+                    editor = default_editor
+        
         if editor: editor = editor.lower()
         if editor=='fck editor':
             editor = 'editor_fck'
@@ -388,13 +397,15 @@
         portal = getToolByName(self, 'portal_url').getPortalObject()
         for path in ('%s_wysiwyg_support' % editor,
             '%s/wysiwyg_support' % editor,
-            'portal_skins/plone_wysiwyg/wysiwyg_support'):
+            'portal_skins/plone_wysiwyg/wysiwyg_support',
+            'portal_skins/archetypes/wysiwyg_support'):
                 template = portal.restrictedTraverse(path, None)
                 if template:
                     break
 
         return template.macros
 
+
     security.declarePublic("forcekupu_url")
     def forcekupu_url(self, fieldName):
         args = {'kupu.convert':fieldName,

From limi at codespeak.net  Thu Oct 15 12:23:21 2009
From: limi at codespeak.net (limi at codespeak.net)
Date: Thu, 15 Oct 2009 12:23:21 +0200 (CEST)
Subject: [kupu-checkins] r68485 - kupu/trunk/kupu/plone
Message-ID: <20091015102321.5F4CF168010@codespeak.net>

Author: limi
Date: Thu Oct 15 12:23:20 2009
New Revision: 68485

Modified:
   kupu/trunk/kupu/plone/librarytool.py
Log:
Making libraries translatable, see http://dev.plone.org/plone/ticket/9232 for more details.


Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Thu Oct 15 12:23:20 2009
@@ -80,6 +80,9 @@
                         lib[key] = library[key] = library[key].text
                     else:
                         lib[key] = library[key](expr_context)
+                if key == 'title':
+                    # translate title in the "kupu" domain
+                    lib[key] = self.translate(lib[key], domain='kupu')
             libraries.append(lib)
         return tuple(libraries)
 

From davisagli at codespeak.net  Mon Oct 19 02:33:12 2009
From: davisagli at codespeak.net (davisagli at codespeak.net)
Date: Mon, 19 Oct 2009 02:33:12 +0200 (CEST)
Subject: [kupu-checkins] r68616 - in kupu/trunk/kupu: doc plone
Message-ID: <20091019003312.C89F8168006@codespeak.net>

Author: davisagli
Date: Mon Oct 19 02:33:12 2009
New Revision: 68616

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
wysiwyg_support isn't moving after all

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Mon Oct 19 02:33:12 2009
@@ -4,8 +4,7 @@
 
 - 1.4.16
 
-  - Updated getWysiwygmacros to respect Plone 4's default_editor property
-    and check for the non-rich wysiwyg_support in the archetypes skin layer.
+  - Updated getWysiwygmacros to respect Plone 4's default_editor property.
 
   - Remove Kupu from the available editors list on uninstall.
 

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Mon Oct 19 02:33:12 2009
@@ -397,8 +397,7 @@
         portal = getToolByName(self, 'portal_url').getPortalObject()
         for path in ('%s_wysiwyg_support' % editor,
             '%s/wysiwyg_support' % editor,
-            'portal_skins/plone_wysiwyg/wysiwyg_support',
-            'portal_skins/archetypes/wysiwyg_support'):
+            'portal_skins/plone_wysiwyg/wysiwyg_support'):
                 template = portal.restrictedTraverse(path, None)
                 if template:
                     break

From hannosch at codespeak.net  Fri Oct 23 13:45:57 2009
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Fri, 23 Oct 2009 13:45:57 +0200 (CEST)
Subject: [kupu-checkins] r68719 - kupu/trunk/Products.kupu
Message-ID: <20091023114557.8861149843C@codespeak.net>

Author: hannosch
Date: Fri Oct 23 13:45:56 2009
New Revision: 68719

Modified:
   kupu/trunk/Products.kupu/setup.py
Log:
Removed no longer reachable url from package metadata


Modified: kupu/trunk/Products.kupu/setup.py
==============================================================================
--- kupu/trunk/Products.kupu/setup.py	(original)
+++ kupu/trunk/Products.kupu/setup.py	Fri Oct 23 13:45:56 2009
@@ -9,17 +9,14 @@
       description="",
       long_description=open(os.path.join("Products", "kupu", "doc", "README.txt")).read() + "\n" +
                        open(os.path.join("Products", "kupu", "doc", "CHANGES.txt")).read().decode('latin1').encode('ascii','replace'),
-      # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
         "Framework :: Plone",
         "Programming Language :: Python",
         "Programming Language :: JavaScript",
-        "Topic :: Software Development :: Libraries :: Python Modules",
         ],
       keywords='',
       author='Kupu Team',
       author_email='kupu-dev at codespeak.net',
-      url='http://kupu.oscom.org/',
       license='Kupu License',
       packages=find_packages(exclude=['ez_setup']),
       namespace_packages=['Products'],

From hannosch at codespeak.net  Sat Oct 24 19:38:42 2009
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Sat, 24 Oct 2009 19:38:42 +0200 (CEST)
Subject: [kupu-checkins] r68731 - kupu/trunk/kupu/plone
Message-ID: <20091024173842.6DD36168008@codespeak.net>

Author: hannosch
Date: Sat Oct 24 19:38:41 2009
New Revision: 68731

Modified:
   kupu/trunk/kupu/plone/__init__.py
Log:
Update to a less technical profile description

Modified: kupu/trunk/kupu/plone/__init__.py
==============================================================================
--- kupu/trunk/kupu/plone/__init__.py	(original)
+++ kupu/trunk/kupu/plone/__init__.py	Sat Oct 24 19:38:41 2009
@@ -50,7 +50,7 @@
     if profile_registry is not None:
         profile_registry.registerProfile('default',
                                      'Kupu',
-                                     'Extension profile for Kupu',
+                                     'Kupu is a cross-browser visual editor.',
                                      'plone/profiles/default',
                                      'kupu',
                                      EXTENSION,