Changeset 697

Timestamp:

12/15/06 09:42:18

Author:

mylan

Message:

Merge trunk to 622 rev. of branches/plone-2.5 (svn merge -r 577:623 http://svn.quintagroup.com/products/qPingTool/branches/plone-2.5 and svn del unnecessery files)

Files:

• qPingTool/trunk/Extensions/Install.py (modified) (1 diff, 1 prop)
• qPingTool/trunk/Extensions/__init__.py (modified) (1 prop)
• qPingTool/trunk/History.txt (modified) (1 prop)
• qPingTool/trunk/PingInfo.py (modified) (1 prop)
• qPingTool/trunk/PingTool.py (modified) (7 diffs, 1 prop)
• qPingTool/trunk/README.txt (modified) (1 prop)
• qPingTool/trunk/TODO.txt (modified) (1 prop)
• qPingTool/trunk/__init__.py (modified) (2 diffs, 1 prop)
• qPingTool/trunk/adapter.py (copied) (copied from qPingTool/branches/plone-2.5/adapter.py)
• qPingTool/trunk/config.py (modified) (1 diff)
• qPingTool/trunk/refresh.txt (modified) (1 prop)
• qPingTool/trunk/skins/qpingtool/ping_now.cpy (modified) (1 prop)
• qPingTool/trunk/skins/qpingtool/ping_now.cpy.metadata (modified) (1 prop)
• qPingTool/trunk/skins/qpingtool/ping_setup.cpt (modified) (1 prop)
• qPingTool/trunk/skins/qpingtool/ping_setup.cpt.metadata (modified) (1 prop)
• qPingTool/trunk/skins/qpingtool/save_ping_setup.cpy (modified) (1 prop)
• qPingTool/trunk/skins/qpingtool/save_ping_setup.cpy.metadata (modified) (1 prop)
• qPingTool/trunk/skins/qpingtool/tool.gif (copied) (copied from qPingTool/branches/plone-2.5/skins/qpingtool/tool.gif)
• qPingTool/trunk/tool.gif (deleted)
• qPingTool/trunk/util.py (copied) (copied from qPingTool/branches/plone-2.5/util.py)
• qPingTool/trunk/version.txt (modified) (1 diff, 1 prop)
• qPingTool/trunk/www (copied) (copied from qPingTool/branches/plone-2.5/www)
• qPingTool/trunk/www/overview.zpt (copied) (copied from qPingTool/branches/plone-2.5/www/overview.zpt)

qPingTool/trunk/Extensions/Install.py

@@ -33 +33 @@
-
-    install_subskin(self,out,GLOBALS)
-
+
-    for site in SITES_LIST:
-
+
+
-
-    pp = getToolByName(self,'portal_properties')

qPingTool/trunk/PingTool.py

@@ -1 @@
-
+
+
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
-from Products.CMFPlone.PloneFolder import PloneFolder
-from config import TOOL_ID, PROJECTNAME
-from Products.Archetypes.public import *
+from Products.ATContentTypes.content.folder import ATFolder
+from Products.ATContentTypes.content.base import updateActions, updateAliases
-from Products.CMFPlone.interfaces.OrderedContainer import IOrderedContainer
-from Products.CMFCore.ActionInformation import ActionInformation
@@ -13 +16 @@
-from Products.XMLRPCMethod.XMLRPCMethod import RPCThread, XMLRPCMethod
-from Products.CMFCore.utils import getToolByName
+from util import getCanonicalURL
-from zLOG import LOG
-
@@ -21 +25 @@
-    fti['allowed_content_types'] = ('PingInfo',)
-    fti['filter_content_types'] = 1
-
-
-
+#
+#
+#
-
-    actions = (
-              { 'id': 'view',
-                'name': 'View',
-                'action': 'string:folder_contents',
-                'permissions': ('Manage portal',),
-                'category':'object',
-              }, )
-    aliases ={'(Default)':'folder_listing','view': 'folder_contents'}
-               
-    fti['aliases'] = aliases
-    fti['actions'] = tuple(actions)
-
-
+ATFolder, PloneFolder, ActionProviderBase): #(
-    """This tool serve for operation with ActionInfo objects
-    """
-
-
+#
-    filter_content_types = 1
-    allowed_content_types = ('PingInfo',)
@@ -48 +41 @@
-    meta_type = archetype_name = portal_type = 'PingTool'
-
+    ########
+    content_icon   = 'tool.gif'
+    immediate_view = 'view'
+    default_view   = 'view'
+
+    ########
-    __implements__ = (IOrderedContainer,)
-    _actions = ( ActionInformation(
@@ -62 +61 @@
-               )
-
+    actions = updateActions(ATFolder,
+        ({'id'         : 'view' \
+         ,'name'       : 'View' \
+         ,'action'     : 'string:folder_contents' \
+         ,'permissions': ('Manage portal',) \
+         ,'category'   :'object' \
+         },
+        )
+    )
+    
+    aliases = updateAliases(ATFolder,
+        {'(Default)'   : 'folder_listing' \
+        ,'view'        : 'folder_contents' \
+        },
+    )
+
+    manage_options =  (
+            {'label' : 'Overview', 'action' : 'manage_overview'},
+        ) + ATFolder.manage_options
+
+    manage_overview = PageTemplateFile(os.path.join('www','overview'), globals())
+    manage_overview.__name__ = 'manage_overview'
+    manage_overview._need__name__ = 0
+
-    def pingFeedReader(self,context):
-        """ ping """
@@ -73 +96 @@
-        title = blog.Title()
-        portal = context.portal_url.getPortalObject()
-portal.getProperty('canonical_url', None
+getCanonicalURL(context
-        if canonical_url:
-            #return "failure", "Please setup 'canonical_url' property for your Plone site"
-            url = context.portal_url.getRelativeContentURL(blog)
-            url = canonical_url + url
-        else:
-
+
+
-        ps = getToolByName(context,'portal_syndication')
-        rss_templates = {'Blog':'','RSS1':'/RSS','RSS2':'/RSS2'}
@@ -136 +159 @@
-        return  pingPropeties
-
+    def om_icons(self):
+        """ Checking on ZMI for canonical_url setting."""
+        icons = ({'path':'misc_/qPingTool/tool.gif' \
+                    ,'alt':self.meta_type \
+                    ,'title':self.meta_type \
+                },)
+        if not getCanonicalURL(self):
+            icons = icons + ({'path':'misc_/PageTemplates/exclamation.gif' \
+                                ,'alt':'Error' \
+                                ,'title':'PingTool needs setting canonical_url' \
+                                },)
+        return icons
+
-registerType(PingTool)

qPingTool/trunk/__init__.py

@@ -7 +7 @@
-from config import *
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-registerDirectory(SKINS_DIR, GLOBALS)
-
-tools = ( PingTool.PingTool, )
-
-def initialize(context):
+    from AccessControl import allow_module
+    allow_module('Products.qPingTool.util')
+
-    utils.ToolInit("PingTool", tools=tools, product_name=PROJECTNAME, icon=TOOL_ICON,
-                  ).initialize(context)
@@ -27 +39 @@
-        fti                = ftis,
-        ).initialize(context)
+

qPingTool/trunk/config.py

@@ -10 +10 @@
-TOOL_ID = 'portal_pingtool'
-
-
+skins/qpingtool/
-
-RSS_LIST = DisplayList((('Blog','Blog'),('RSS','RSS1'),('RSS2','RSS2')))

qPingTool/trunk/version.txt

@@ -1 @@
-2
+3