Fix template selection in plugin

addon.json

@@ -1,5 +1,5 @@
 {
-    "name": "Gallery",
+    "name": "Aldryn Gallery",
     "description": "Easy to use and powerfull gallery system",
     "url": "https://github.com/aldryn/aldryn-gallery",
     "package-name": "aldryn-gallery",

aldryn_gallery/forms.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from django.conf import settings
 from django import forms
 from django.template import TemplateDoesNotExist
 from django.template.loader import select_template
@@ -12,11 +13,19 @@ class Meta:
         fields = ['style', 'engine', 'timeout', 'duration', 'shuffle']
         model = GalleryPlugin
 
+    def get_slide_template(self, style, name='slide'):
+        return 'aldryn_gallery/plugins/{}/{}.html'.format(
+            style, name,
+        )
+
     def clean_style(self):
         style = self.cleaned_data.get('style')
         # Check if template for style exists:
         try:
-            select_template(['aldryn_gallery/%s/gallery.html' % style])
+            if settings.ALDRYN_BOILERPLATE_NAME == 'legacy':
+                select_template([self.get_slide_template(style=style, name='slide')])
+            else:  # for 'bootstrap3' boilerplate and the recommended structure for other boilerplates
+                select_template([self.get_slide_template(style=style, name='image_slide')])
         except TemplateDoesNotExist:
             raise forms.ValidationError("Not a valid style (Template does not exist)")
         return style

aldryn_gallery/templatetags/shuffle.py

@@ -9,6 +9,8 @@
 @register.filter
 def shuffle(arg):
     # slice it, cast it to list
+    if not arg:
+        return arg
     my_list = list(arg[:])
     random.shuffle(my_list)
     return my_list