diff --git a/CHANGES.rst b/CHANGES.rst
index f3704ba..b4add6f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
1.1b2 (unreleased)
------------------
+- Remove dependency on five.grok (closes `#5`_).
+ [rodfersou]
+
- Package is now compatible with Plone 5.
[hvelarde]
@@ -95,6 +98,7 @@ Changelog
- Initial release.
.. _`#3`: https://github.com/collective/collective.liveblog/issues/3
+.. _`#5`: https://github.com/collective/collective.liveblog/issues/5
.. _`#6`: https://github.com/collective/collective.liveblog/issues/6
.. _`#7`: https://github.com/collective/collective.liveblog/issues/7
.. _`#10`: https://github.com/collective/collective.liveblog/issues/10
diff --git a/setup.py b/setup.py
index 4e1f581..c072fd8 100644
--- a/setup.py
+++ b/setup.py
@@ -40,13 +40,11 @@
include_package_data=True,
zip_safe=False,
install_requires=[
- 'five.grok',
'plone.api',
- 'plone.app.dexterity [grok]',
+ 'plone.app.dexterity',
'plone.app.layout',
'plone.batching',
'plone.dexterity',
- 'plone.directives.form',
'plone.memoize',
'plone.namedfile [blobs]',
'Products.CMFPlone >=4.3',
diff --git a/src/collective/liveblog/browser/configure.zcml b/src/collective/liveblog/browser/configure.zcml
index ac86323..18d3258 100644
--- a/src/collective/liveblog/browser/configure.zcml
+++ b/src/collective/liveblog/browser/configure.zcml
@@ -29,4 +29,41 @@
layer="collective.liveblog.interfaces.IBrowserLayer"
/>
+
+
+
+
+
+
+
+
diff --git a/src/collective/liveblog/browser/header.py b/src/collective/liveblog/browser/header.py
index 94faf6f..247cf70 100644
--- a/src/collective/liveblog/browser/header.py
+++ b/src/collective/liveblog/browser/header.py
@@ -1,22 +1,11 @@
# -*- coding: utf-8 -*-
-from five import grok
-from plone.app.layout.viewlets.interfaces import IAboveContent
-from collective.liveblog.interfaces import ILiveblog
-from collective.liveblog.interfaces import IBrowserLayer
+from plone.app.layout.viewlets.common import ViewletBase
-grok.templatedir('templates')
-
-class Header(grok.Viewlet):
+class Header(ViewletBase):
"""A viewlet to include a header in the Liveblog."""
- grok.name('collective.liveblog.header')
- grok.context(ILiveblog)
- grok.layer(IBrowserLayer)
- grok.require('zope2.View')
- grok.viewletmanager(IAboveContent)
-
def available(self):
"""Return True if an image has been defined."""
return self.context.image is not None
diff --git a/src/collective/liveblog/browser/recent_updates.py b/src/collective/liveblog/browser/recent_updates.py
index eb31b16..eb75ab0 100644
--- a/src/collective/liveblog/browser/recent_updates.py
+++ b/src/collective/liveblog/browser/recent_updates.py
@@ -2,30 +2,19 @@
from App.Common import rfc1123_date
from collective.liveblog.browser.base import BaseView
from collective.liveblog.config import PROJECTNAME
-from collective.liveblog.interfaces import IBrowserLayer
-from collective.liveblog.interfaces import ILiveblog
from datetime import datetime
-from five import grok
-# from plone.memoize import ram
from time import time
+from zope.publisher.browser import BrowserView
import logging
logger = logging.getLogger(PROJECTNAME)
-grok.templatedir('templates')
-
-class RecentUpdates(grok.View, BaseView):
+class RecentUpdates(BrowserView, BaseView):
"""Helper view for Liveblog."""
- grok.context(ILiveblog)
- grok.layer(IBrowserLayer)
- grok.name('recent-updates')
- grok.require('zope2.View')
- grok.template('recent_updates')
-
def _needs_hard_refresh(self):
"""Return True if a hard refresh of the page is needed.
diff --git a/src/collective/liveblog/browser/templates/header.pt b/src/collective/liveblog/browser/templates/header.pt
index ef3015e..6ced7ac 100644
--- a/src/collective/liveblog/browser/templates/header.pt
+++ b/src/collective/liveblog/browser/templates/header.pt
@@ -5,11 +5,11 @@
i18n:domain="collective.liveblog"
tal:omit-tag="">
-
+
-