pyams/pyams_portal: comparison src/pyams

equal deleted inserted replaced

-:69d8c550cc2d
+:8a1a1e258f43
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
 #
 import logging
-logger = logging.getLogger('PyAMS (portal)')
 import venusian
 from persistent import Persistent
 from persistent.mapping import PersistentMapping
 from pyramid.exceptions import ConfigurationError
 from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
 from zope.traversing.interfaces import ITraversable
 from pyams_cache.beaker import get_cache
 from pyams_form.interfaces.form import IFormContextPermissionChecker
-from pyams_portal.interfaces import IPortalContext, IPortalPage, IPortalPortletsConfiguration, IPortalTemplate, \
+from pyams_portal.interfaces import IPortalContext, IPortalPage, IPortalPortletsConfiguration, \
-IPortalTemplateConfiguration, IPortlet, IPortletConfiguration, IPortletPreviewer, IPortletRenderer, \
+IPortalTemplate, IPortalTemplateConfiguration, IPortlet, IPortletConfiguration, \
-IPortletRendererSettings, IPortletSettings, MANAGE_TEMPLATE_PERMISSION, PORTLET_RENDERER_SETTINGS_KEY, PREVIEW_MODE
+IPortletPreviewer, IPortletRenderer, IPortletRendererSettings, IPortletSettings, \
-from pyams_utils.adapter import ContextAdapter, adapter_config, get_adapter_weight, get_annotation_adapter
+MANAGE_TEMPLATE_PERMISSION, PORTLET_RENDERER_SETTINGS_KEY, PREVIEW_MODE
-from pyams_utils.factory import get_object_factory, is_interface, factory_config
+from pyams_utils.adapter import ContextAdapter, adapter_config, get_adapter_weight, \
+get_annotation_adapter
+from pyams_utils.factory import factory_config, get_object_factory, is_interface
 from pyams_utils.interfaces import ICacheKeyValue
 from pyams_utils.interfaces.url import DISPLAY_CONTEXT
 from pyams_utils.registry import get_global_registry
 from pyams_utils.request import check_request
 from pyams_utils.vocabulary import vocabulary_config
 from pyams_viewlet.viewlet import ViewContentProvider
 __docformat__ = 'restructuredtext'
+from pyams_portal import _
+logger = logging.getLogger('PyAMS (portal)')
 #
 # Portlets utilities
 #
 else:
 factory = None
 component = ob
 config = context.config.with_package(info.module)
-logger.debug("Registering portlet {0} named '{1}'".format(str(component) if component else str(factory),
+logger.debug("Registering portlet {0} named '{1}'".format(
-name))
+str(component) if component else str(factory), name))
 config.registry.registerUtility(component=component, factory=factory,
 provided=IPortlet, name=name)
 info = self.venusian.attach(wrapped, callback, category='pyams_portal',
 depth=depth + 1)
 class PortletContentProvider(ViewContentProvider):
 """Base portlet content provider"""
 def __init__(self, context, request, view, settings):
 super(PortletContentProvider, self).__init__(context, request, view)
-self.portlet = request.registry.queryUtility(IPortlet, name=settings.configuration.portlet_name)
+self.portlet = request.registry.queryUtility(IPortlet,
+name=settings.configuration.portlet_name)
 self.settings = settings
 def render(self):
 if self.portlet is None:
 return ''
 if self.portlet.permission and not self.request.has_permission(self.portlet.permission):
 return ''
 return super(PortletContentProvider, self).render()
+PREVIEW_PREFIX = '''<div class="padding-x-5 text-info">
+<span>{label}</span>
+{renderer}
+</div>'''
 @implementer(IPortletPreviewer)
 class PortletPreviewer(PortletContentProvider):
 """Portlet previewer adapter"""
 def render(self):
 if self.settings.renderer == 'hidden':
 return render('templates/portlet-hidden.pt', {}, request=self.request)
 else:
-return super(PortletPreviewer, self).render()
+result = super(PortletPreviewer, self).render()
+settings = self.settings
+if settings.renderer:
+renderer = settings.get_renderer()
+translate = self.request.localizer.translate
+result = PREVIEW_PREFIX.format(label=translate(_("Renderer:")),
+renderer=translate(renderer.label)) + result
+return result
 PORTLETS_CACHE_REGION = 'portlets'
 PORTLETS_CACHE_NAME = 'PyAMS::portlet'
 lang=self.request.locale_name)
 else:
 return PORTLETS_CACHE_DISPLAY_CONTEXT_KEY.format(portlet=ICacheKeyValue(self.settings),
 hostname=self.request.host,
 context=ICacheKeyValue(self.context),
-display=ICacheKeyValue(display_context),
+display=ICacheKeyValue(
+display_context),
 lang=self.request.locale_name)
 def render(self):
 preview_mode = self.request.annotations.get(PREVIEW_MODE, False)
 if preview_mode or not self.use_portlets_cache:
 def __init__(self, context):
 request = check_request()
 translate = request.localizer.translate
 terms = [SimpleTerm(name, title=translate(adapter.label))
-for name, adapter in sorted(request.registry.getAdapters((request.root, request, request, context),
+for name, adapter in sorted(request.registry.getAdapters((request.root, request,
+request, context),
 IPortletRenderer),
 key=get_adapter_weight)]
 super(PortletRenderersVocabulary, self).__init__(terms)
 def renderer(self, value):
 value = value or ''
 if value == self._renderer:
 return
 request = check_request()
-renderer = request.registry.queryMultiAdapter((request.root, request, request, self), IPortletRenderer,
+renderer = request.registry.queryMultiAdapter((request.root, request, request, self),
-name=self._renderer)
+IPortletRenderer, name=self._renderer)
 if (renderer is not None) and (renderer.target_interface is not None):
 noLongerProvides(self, renderer.target_interface)
 self._renderer = value
-renderer = request.registry.queryMultiAdapter((request.root, request, request, self), IPortletRenderer,
+renderer = request.registry.queryMultiAdapter((request.root, request, request, self),
-name=self._renderer)
+IPortletRenderer, name=self._renderer)
 if (renderer is not None) and (renderer.target_interface is not None):
 alsoProvides(self, renderer.target_interface)
 def get_renderer(self, request=None):
 if request is None:
 request = check_request()
-return request.registry.queryMultiAdapter((request.root, request, request, self), IPortletRenderer,
+return request.registry.queryMultiAdapter((request.root, request, request, self),
-name=self._renderer)
+IPortletRenderer, name=self._renderer)
 @property
 def configuration(self):
 return self.__parent__
 parent = self.__parent__
 if IPortalTemplate.providedBy(parent):
 return parent
 while True:
 if IPortalContext.providedBy(parent):
-configuration = IPortalPortletsConfiguration(parent).get_portlet_configuration(self.portlet_id)
+configuration = IPortalPortletsConfiguration(parent).get_portlet_configuration(
+self.portlet_id)
 if not configuration.inherit_parent:
 return parent
 page = IPortalPage(parent)
 if not page.inherit_parent:
 break
 return page.template
 @property
 def settings(self):
 if self.inherit_parent:
-return IPortalPortletsConfiguration(self.parent).get_portlet_configuration(self.portlet_id).settings
+return IPortalPortletsConfiguration(self.parent).get_portlet_configuration(
+self.portlet_id).settings
 else:
 return self._settings
 @property
 def editor_settings(self):

changeset 266	8a1a1e258f43
parent 263	87994557fc51
child 269	ecbd099f2627