Changeset 1313 in products for quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/viewlets.py

Timestamp:

Sep 18, 2009 5:29:41 PM (15 years ago)

Author:

liebster

Message:

Added metatags order feature, which is managed by metatags_order property of of configlet

File:

• quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/viewlets.py (modified) (4 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/viewlets.py

@@ -1 +1 @@
 from cgi import escape
 from zope.component import getMultiAdapter
-from zope.viewlet.interfaces import IViewlet
 from Products.CMFPlone.utils import safe_unicode
 from plone.app.layout.viewlets.common import ViewletBase
 from Products.CMFCore.utils import getToolByName
-from AccessControl import Unauthorized
-from quintagroup.seoptimizer.util import SortedDict
-from quintagroup.seoptimizer.interfaces import IKeywords 
+
 
 class TitleCommentViewlet(ViewletBase):
@@ -49 +46 @@
                 return u"%s\n%s"%(qseo_title, qseo_comments)
 
-#class HTTPEquiv(ViewletBase):
-#    
-#    def charset( self ):
-#        context = self.context.aq_inner
-#        site_properties = getToolByName( context, 'portal_properties').site_properties
-#        return site_properties.getProperty('default_charset', 'utf-8')
-#    
-#    def render( self ):
-#        return """<meta http-equiv="Content-Type" content="text/html; charset=%s" />"""%self.charset()
-#         
-#class BaseUrlViewlet( ViewletBase ):
-#    """
-#       simpel viewlet for base href rendering
-#    """
-#    def renderBase( self ):
-#        # returns correct base href
-#        context = self.context.aq_inner
-#        isFolder = getattr(context.aq_explicit, 'isPrincipiaFolderish', 0)
-#        base_url = context.absolute_url()
-#
-#        # when accessing via WEBDAV you're not allowed to access aq_explicit
-#        try:
-#            return isFolder and '%s/'%base_url or base_url
-#        except (Unauthorized, 'Unauthorized'):
-#            pass
-#
-#    def render( self ):
-#        return """<base href="%s" /><!--[if lt IE 7]></base><![endif]-->"""% self.renderBase()
-
-class MetaTagsViewlet( ViewletBase ):
-
-    def listMetaTags( self ):
-        context = self.context.aq_inner
-        portal_props = getToolByName(context, 'portal_properties')
-        pu = getToolByName(context, 'plone_utils')
-        seo_props = getToolByName(portal_props, 'seo_properties', None)
-        if seo_props is None:
-            return pu.listMetaTags(context)
-
-        site_props = getToolByName(portal_props, 'site_properties')
-        exposeDCMetaTags = site_props.exposeDCMetaTags
-
-        metaTags = SortedDict()
-        #metaTags.update(pu.listMetaTags(context))
-        metadataList = [
-            ('seo_description', 'description'),
-            ('seo_keywords',    'keywords'),
-            ('seo_robots',      'robots'),
-            ('seo_distribution','distribution')]
-
-        if exposeDCMetaTags:
-            metadataList.append(('seo_distribution', 'DC.distribution'))
-
-        seo_context = getMultiAdapter((self.context, self.request), name='seo_context')
-        for accessor, key in metadataList:
-            method = getattr(seo_context, accessor, None)
-            if not callable(method):
-                # ups
-                continue
-            # Catch AttributeErrors raised by some AT applications
-            try:
-                value = method()
-            except AttributeError:
-                value = None
-
-            if not value:
-                continue
-            if isinstance(value, (tuple, list)):
-                value = ', '.join(value)
-
-            metaTags[key] = value
-
-        # add custom meta tags (added from qseo tab by user) for given context and default from configlet
-        custom_meta_tags = seo_context.seo_customMetaTags()
-        for tag in custom_meta_tags:
-            if tag['meta_content']:
-                metaTags[tag['meta_name']] = tag['meta_content']
-
-        # Set the additional matching keywords, if any
-        adapter = IKeywords(context, None)
-        if adapter is not None:
-            keywords = adapter.listKeywords()
-            if keywords:
-                metaTags['keywords'] = keywords
-
-        return metaTags
-
-    def render( self ):
-        return '\n'.join([safe_unicode("""<meta name="%s" content="%s" />"""%(name, content)) \
-                                       for name, content in self.listMetaTags().items()])
 
 class CustomScriptViewlet( ViewletBase ):
@@ -148 +55 @@
         if seo_props is None:
             return '' 
-        return seo_props.getProperty('custom_script', '')
+        return seo_props.getProperty('custom_script', '')
 
     def render( self ):
@@ -162 +69 @@
         seo_context = getMultiAdapter((self.context, self.request), name='seo_context')
         return """<link rel="canonical" href="%s" />""" % seo_context.seo_canonical()
-