[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/Portal.py Logging code removed.

[Charlie Clark]

Log message for revision 117480:
  Logging code removed.
  manage_options set explicitly to remove "properties" which can be handled within the site.

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/Portal.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Portal.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Portal.py	2010-10-12 15:35:57 UTC (rev 117479)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Portal.py	2010-10-12 19:13:06 UTC (rev 117480)
@@ -15,6 +15,11 @@
 
 from App.class_init import InitializeClass
 
+from OFS.FindSupport import FindSupport
+from OFS.ObjectManager import ObjectManager
+from OFS.role import RoleManager
+from OFS.SimpleItem import Item
+
 from Products.CMFCore.PortalObject import PortalObjectBase
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
 from Products.CMFDefault.permissions import AddPortalContent
@@ -23,8 +28,6 @@
 from Products.CMFDefault.permissions import ReplyToItem
 from Products.CMFDefault.permissions import View
 
-from logging import getLogger
-LOG = getLogger("CMF Portal Object")
 
 class CMFSite(PortalObjectBase, DefaultDublinCoreImpl):
 
@@ -41,8 +44,14 @@
     title = ''
     description = ''
 
-    manage_options = PortalObjectBase.manage_options[:2] + \
-                     PortalObjectBase.manage_options[3:]
+    manage_options = ObjectManager.manage_options +\
+                     ({'label': 'Components', 'action': 'manage_components'},
+                      {'label': 'Components Folder',
+                       'action': '++etc++site/manage_main'},
+                      {'label': 'View', 'action': ''}) +\
+                     RoleManager.manage_options +\
+                     Item.manage_options +\
+                     FindSupport.manage_options
 
     __ac_permissions__=( ( AddPortalContent, () )
                        , ( AddPortalFolders, () )