Plone 6 compatibility

CHANGES.rst

@@ -5,7 +5,8 @@ Changelog
 2.3.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Plone 6 compatibility.
+  [cekk]
 
 
 2.3.0 (2020-07-21)

Gruntfile.js

@@ -1,4 +1,4 @@
-const sass = require('node-sass');
+const sass = require('sass');
 
 module.exports = function(grunt) {
   'use strict';

package.json

@@ -31,9 +31,9 @@
     "grunt-postcss": "^0.9.0",
     "grunt-sass": "^3.1.0",
     "load-grunt-tasks": "^3.5.2",
-    "node-sass": "^4.13.0",
     "pixrem": "^3.0.2",
     "prettier": "^1.19.1",
+    "sass": "^1.93.2",
     "stylelint": "^13.0.0",
     "stylelint-config-prettier": "^8.0.1",
     "stylelint-config-recommended": "^3.0.0"

src/redturtle/gallery/browser/configure.zcml

@@ -30,6 +30,27 @@
       layer="redturtle.gallery.interfaces.IRedturtleGalleryLayer"
       />
 
+
+  <browser:page
+      name="gallery_modal"
+      for="plone.dexterity.interfaces.IDexterityContainer"
+      class=".gallery.GalleryView"
+      template="templates/gallery_modal.pt"
+      permission="zope2.View"
+      layer="redturtle.gallery.interfaces.IRedturtleGalleryLayer"
+      />
+
+  <browser:page
+      name="gallery_modal"
+      for="plone.app.contenttypes.interfaces.ICollection"
+      class=".gallery.GalleryCollectionView"
+      template="templates/gallery_modal.pt"
+      permission="zope2.View"
+      layer="redturtle.gallery.interfaces.IRedturtleGalleryLayer"
+      />
+
+
+
   <include package="plone.app.contentmenu" />
   <browser:menuItems
       for="plone.app.contenttypes.interfaces.IFolder"

src/redturtle/gallery/browser/gallery.py

@@ -1,23 +1,15 @@
 # -*- coding: utf-8 -*-
 from plone.app.contenttypes.browser.folder import FolderView
 from plone.app.contenttypes.browser.collection import CollectionView
-from Products.CMFPlone.resources import add_bundle_on_request
-from Products.Five.browser import BrowserView
 
 
-class GalleryView(FolderView, BrowserView):
+class GalleryView(FolderView):
     """
     Gallery view
     """
-    def __call__(self):
-        add_bundle_on_request(self.request, 'collective-slick')
-        add_bundle_on_request(self.request, 'redturtle-gallery-bundle')
-        return super(GalleryView, self).__call__()
 
 
-class GalleryCollectionView(CollectionView, GalleryView):
+class GalleryCollectionView(CollectionView):
     """
     Gallery view for collections
     """
-    def __call__(self):
-        return super(GalleryCollectionView, self).__call__()