[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Got rid of redundant icon related type info properties.

Hanno Schlichting hannosch at hannosch.eu
Fri Nov 13 10:00:14 EST 2009


Log message for revision 105608:
  Got rid of redundant icon related type info properties.
  
  NOTE: This package still needs the upgrade steps - coming up next :)
  

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Discussion_Item.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2009-11-13 15:00:13 UTC (rev 105608)
@@ -4,6 +4,9 @@
 2.2.0 (unreleased)
 ------------------
 
+- Got rid of redundant icon related type info properties.
+  (https://bugs.launchpad.net/zope-cmf/+bug/397795)
+
 - Folder views: Rebuilt the CMF folder views based on 
   zope.formlib.
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml	2009-11-13 15:00:13 UTC (rev 105608)
@@ -4,7 +4,7 @@
  <property name="title" i18n:translate="">CMF BTree Folder</property>
  <property name="description"
     i18n:translate="">Folder for holding very large numbers of items.</property>
- <property name="content_icon">folder_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/folder_icon.gif</property>
  <property name="content_meta_type">CMF BTree Folder</property>
  <property name="product"></property>
  <property name="factory">cmf.folder.btree</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Discussion_Item.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Discussion_Item.xml	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Discussion_Item.xml	2009-11-13 15:00:13 UTC (rev 105608)
@@ -5,7 +5,7 @@
  <property name="description"
     i18n:translate="">Discussion Items are documents which reply to other content.
   They should *not* be addable through the standard 'folder_factories' interface.</property>
- <property name="content_icon">discussionitem_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/discussionitem_icon.gif</property>
  <property name="content_meta_type">Discussion Item</property>
  <property name="product"></property>
  <property name="factory"></property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml	2009-11-13 15:00:13 UTC (rev 105608)
@@ -5,7 +5,7 @@
  <property name="description"
     i18n:translate="">Documents contain text that can be formatted using 'Structured Text.'
   They may also contain HTML, or "plain" text.</property>
- <property name="content_icon">document_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/document_icon.gif</property>
  <property name="content_meta_type">Document</property>
  <property name="product"></property>
  <property name="factory">cmf.document</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml	2009-11-13 15:00:13 UTC (rev 105608)
@@ -4,7 +4,7 @@
  <property name="title" i18n:translate="">Favorite</property>
  <property name="description"
     i18n:translate="">A Favorite is a Link to an intra-portal resource.</property>
- <property name="content_icon">link_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/link_icon.gif</property>
  <property name="content_meta_type">Favorite</property>
  <property name="product"></property>
  <property name="factory">cmf.favorite</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml	2009-11-13 15:00:13 UTC (rev 105608)
@@ -4,7 +4,7 @@
  <property name="title" i18n:translate="">File</property>
  <property name="description"
     i18n:translate="">File objects can contain arbitrary downloadable files.</property>
- <property name="content_icon">file_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/file_icon.gif</property>
  <property name="content_meta_type">Portal File</property>
  <property name="product"></property>
  <property name="factory">cmf.file</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml	2009-11-13 15:00:13 UTC (rev 105608)
@@ -4,7 +4,7 @@
  <property name="title" i18n:translate="">Folder</property>
  <property name="description"
     i18n:translate="">Use folders to put content in categories.</property>
- <property name="content_icon">folder_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/folder_icon.gif</property>
  <property name="content_meta_type">Portal Folder</property>
  <property name="product"></property>
  <property name="factory">cmf.folder</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml	2009-11-13 15:00:13 UTC (rev 105608)
@@ -4,7 +4,7 @@
  <property name="title" i18n:translate="">Image</property>
  <property name="description"
     i18n:translate="">Image objects can be embedded in Portal documents.</property>
- <property name="content_icon">image_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/image_icon.gif</property>
  <property name="content_meta_type">Portal Image</property>
  <property name="product"></property>
  <property name="factory">cmf.image</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml	2009-11-13 15:00:13 UTC (rev 105608)
@@ -4,7 +4,7 @@
  <property name="title" i18n:translate="">Link</property>
  <property name="description"
     i18n:translate="">Link items are annotated URLs.</property>
- <property name="content_icon">link_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/link_icon.gif</property>
  <property name="content_meta_type">Link</property>
  <property name="product"></property>
  <property name="factory">cmf.link</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml	2009-11-13 15:00:13 UTC (rev 105608)
@@ -5,7 +5,7 @@
  <property name="description"
     i18n:translate="">News Items contain short text articles and carry a title as well as
   an optional description.</property>
- <property name="content_icon">newsitem_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/newsitem_icon.gif</property>
  <property name="content_meta_type">News Item</property>
  <property name="product"></property>
  <property name="factory">cmf.newsitem</property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py	2009-11-13 14:58:28 UTC (rev 105607)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py	2009-11-13 15:00:13 UTC (rev 105608)
@@ -49,7 +49,7 @@
 from Products.CMFCore.tests.base.content import STX_WITH_HTML
 from Products.CMFCore.tests.base.dummy import DummySite
 from Products.CMFCore.tests.base.testcase import RequestTest
-from Products.CMFCore.tests.base.tidata import FTIDATA_CMF15
+from Products.CMFCore.tests.base.tidata import FTIDATA_CMF
 from Products.CMFCore.TypesTool import FactoryTypeInformation as FTI
 from Products.CMFCore.TypesTool import TypesTool
 from Products.CMFDefault import utils
@@ -564,7 +564,7 @@
         self.REQUEST['BODY']=BASIC_HTML
 
         ttool = self.site._setObject( 'portal_types', TypesTool() )
-        fti = FTIDATA_CMF15[0].copy()
+        fti = FTIDATA_CMF[0].copy()
         del fti['id']
         ttool._setObject( 'Document', FTI('Document', **fti) )
 



More information about the checkins mailing list