[z3-checkins] r21649 - z3/CMFonFive/branch/CMFonFive-1.1

[regebro at codespeak.net]

Author: regebro
Date: Mon Jan  2 21:29:20 2006
New Revision: 21649

Removed:
   z3/CMFonFive/branch/CMFonFive-1.1/metadirectives.py
Modified:
   z3/CMFonFive/branch/CMFonFive-1.1/CHANGES.txt
   z3/CMFonFive/branch/CMFonFive-1.1/README.txt
   z3/CMFonFive/branch/CMFonFive-1.1/fiveactionstool.py
   z3/CMFonFive/branch/CMFonFive-1.1/version.txt
Log:
Minor changes before a minor bugfix release.


Modified: z3/CMFonFive/branch/CMFonFive-1.1/CHANGES.txt
==============================================================================
--- z3/CMFonFive/branch/CMFonFive-1.1/CHANGES.txt	(original)
+++ z3/CMFonFive/branch/CMFonFive-1.1/CHANGES.txt	Mon Jan  2 21:29:20 2006
@@ -1,6 +1,10 @@
 CMFonFive Product Changelog
 
-  After CMFonFive 1.1.0
+  CMFonFive 1.1.1 (2006/01/02)
+
+    - Menu titles was converted to strings even if they were messageIDs.
+
+    - Spelling fixes.
   
   CMFonFive 1.1.0 (2005/06/19)
 

Modified: z3/CMFonFive/branch/CMFonFive-1.1/README.txt
==============================================================================
--- z3/CMFonFive/branch/CMFonFive-1.1/README.txt	(original)
+++ z3/CMFonFive/branch/CMFonFive-1.1/README.txt	Mon Jan  2 21:29:20 2006
@@ -1,27 +1,35 @@
 CMFonFive
 =========
 CMFonFive is a product that provides integration between CMF and Five, 
-making it ossible to write Five products tht run on CMF.
+making it possible to write Five products that run on CMF.
 
 * http://www.zope.org/Products/CMF/
 * http://codespeak.net/z3/five/
 
 
-CMFonFive has two main parts:
+CMFonFive has three main parts:
+
 * A set of interface definitions for many parts of CMF.
+
 * A portal_fiveactions tool that enables you to create actions and action 
   menus in CMF by the browser:menu and browser:menuItem ZCML statements.
 
+* A skin that bridges between the Zope 3 master template and a CMF 
+  main_template, enabling Five products to have CMF look.
+
 
 Requirements
 ------------
+
 * CMF 1.4 or 1.5.
+
 * Five 1.0.1
 
 
 Installation
 ------------
-The interface suppert needs no installation. If you want the menuItem 
+
+The interface and skin support needs no installation. If you want the menuItem 
 support, you simply create a Five Actions Tool in your CMF site, and set 
 that tool up as an action provider in the portal_actions tool.
 
@@ -31,5 +39,7 @@
 
 Contributors
 ------------
+
 * Tres Seaver (tseaver at zope.com)
+
 * Lennart Regebro (regebro at nuxeo.com)

Modified: z3/CMFonFive/branch/CMFonFive-1.1/fiveactionstool.py
==============================================================================
--- z3/CMFonFive/branch/CMFonFive-1.1/fiveactionstool.py	(original)
+++ z3/CMFonFive/branch/CMFonFive-1.1/fiveactionstool.py	Mon Jan  2 21:29:20 2006
@@ -67,8 +67,13 @@
                 else:
                     filter = Expression(text=str(entry['filter']))
 
+                title = entry['title']
+                # Having bits of unicode here can make rendering very confused.
+                if isinstance(title, unicode):
+                    title = str(title)
+
                 act = ActionInformation(id=act_id,
-                    title=str(entry['title']),
+                    title=title,
                     action=Expression(text='string:%s' % action),
                     condition=filter,
                     category=str(mid),

Deleted: /z3/CMFonFive/branch/CMFonFive-1.1/metadirectives.py
==============================================================================
--- /z3/CMFonFive/branch/CMFonFive-1.1/metadirectives.py	Mon Jan  2 21:29:20 2006
+++ (empty file)
@@ -1,12 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005 CMFonFive Contributors. All rights reserved.
-#
-# This software is distributed under the terms of the Zope Public
-# License (ZPL) v2.1. See COPYING.txt for more information.
-#
-###########################################################################
-""" Meta directives from CMFonFive
-
-"""
-from Products.Five.

Modified: z3/CMFonFive/branch/CMFonFive-1.1/version.txt
==============================================================================
--- z3/CMFonFive/branch/CMFonFive-1.1/version.txt	(original)
+++ z3/CMFonFive/branch/CMFonFive-1.1/version.txt	Mon Jan  2 21:29:20 2006
@@ -1 +1 @@
-CMFonFive-1.1.0
+CMFonFive-1.1.1