diff --git a/news/157.feature b/news/157.feature new file mode 100644 index 00000000..412295ce --- /dev/null +++ b/news/157.feature @@ -0,0 +1,2 @@ +Add a sorrounding div to the webstats js. Fixes #157 +[erral] diff --git a/plone/app/layout/analytics/tests/analytics.txt b/plone/app/layout/analytics/tests/analytics.txt index 44fec511..01deb6cc 100644 --- a/plone/app/layout/analytics/tests/analytics.txt +++ b/plone/app/layout/analytics/tests/analytics.txt @@ -33,3 +33,8 @@ Now enter some non-ascii text >>> text = manager.render() >>> site_settings.webstats_js in text True + +Check if the div sorrounding the script is present + + >>> 'id="plone-analytics"' in text + True diff --git a/plone/app/layout/analytics/view.pt b/plone/app/layout/analytics/view.pt new file mode 100644 index 00000000..ebd13fd5 --- /dev/null +++ b/plone/app/layout/analytics/view.pt @@ -0,0 +1,8 @@ +
+ Here goes the webstats_js +
+ diff --git a/plone/app/layout/analytics/view.py b/plone/app/layout/analytics/view.py index 6f5478f8..89c7414e 100644 --- a/plone/app/layout/analytics/view.py +++ b/plone/app/layout/analytics/view.py @@ -2,6 +2,7 @@ from plone.registry.interfaces import IRegistry from Products.CMFPlone.interfaces import ISiteSchema from Products.Five.browser import BrowserView +from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile from zope.component import getUtility from zope.interface import implementer from zope.viewlet.interfaces import IViewlet @@ -10,6 +11,8 @@ @implementer(IViewlet) class AnalyticsViewlet(BrowserView): + render = ViewPageTemplateFile('view.pt') + def __init__(self, context, request, view, manager): super(AnalyticsViewlet, self).__init__(context, request) self.__parent__ = view @@ -17,18 +20,15 @@ def __init__(self, context, request, view, manager): self.request = request self.view = view self.manager = manager + self.webstats_js = '' def update(self): - pass - - def render(self): """render the webstats snippet""" registry = getUtility(IRegistry) site_settings = registry.forInterface( ISiteSchema, prefix="plone", check=False) try: if site_settings.webstats_js: - return site_settings.webstats_js + self.webstats_js = site_settings.webstats_js except AttributeError: pass - return ''