added changes from comments

Author: FinalAngel

README.rst

@@ -15,6 +15,8 @@ This addon is compatible with `Aldryn <http://aldryn.com>`_ and is also availabl
 `django CMS Marketplace <https://marketplace.django-cms.org/en/addons/browse/djangocms-file/>`_
 for easy installation.
 
+.. image:: preview.gif
+
 
 Contributing
 ============

aldryn_config.py

@@ -1,2 +1,29 @@
 # -*- coding: utf-8 -*-
 from aldryn_client import forms
+
+
+def split_and_strip(string):
+    return [item.strip() for item in string.split(',') if item]
+
+
+class Form(forms.BaseForm):
+    templates = forms.CharField(
+        'List of additional templates (comma separated)',
+        required=False,
+    )
+
+    def clean(self):
+        data = super(Form, self).clean()
+
+        # prettify
+        data['templates'] = ', '.join(split_and_strip(data['templates']))
+        return data
+
+    def to_settings(self, data, settings):
+        if data['templates']:
+            settings['DJANGOCMS_FILE_TEMPLATES'] = [
+                (item, item)
+                for item in split_and_strip(data['templates'])
+            ]
+
+        return settings

djangocms_file/cms_plugins.py

@@ -57,6 +57,11 @@ class FolderPlugin(CMSPluginBase):
         }),
     ]
 
+    def render(self, context, instance, placeholder):
+        context['folder_files'] = instance.get_files()
+
+        return super(FolderPlugin, self).render(context, instance, placeholder)
+
     def get_render_template(self, context, instance, placeholder):
         return 'djangocms_file/{}/folder.html'.format(instance.template)
 

djangocms_file/models.py

@@ -17,18 +17,21 @@
 
 
 LINK_TARGET = (
-    ('_self', _('Open in same window.')),
-    ('_blank', _('Open in new window.')),
-    ('_parent', _('Delegate to parent.')),
-    ('_top', _('Delegate to top.')),
+    ('_self', _('Open in same window')),
+    ('_blank', _('Open in new window')),
+    ('_parent', _('Delegate to parent')),
+    ('_top', _('Delegate to top')),
 )
 
 
 # Add additional choices through the ``settings.py``.
 def get_templates():
-    choices = getattr(
+    choices = [
+        ('default', _('Default')),
+    ]
+    choices += getattr(
         settings,
-        'DJANGOCMS_FILE_TEMPLATES',
+        'DJANGOCMS_PICTURE_TEMPLATES',
         [],
     )
     return choices
@@ -41,14 +44,10 @@ class File(CMSPlugin):
     """
     search_fields = ('name',)
 
-    TEMPLATE_CHOICES = [
-        ('default', _('Default')),
-    ]
-
     template = models.CharField(
         verbose_name=_('Template'),
-        choices=TEMPLATE_CHOICES + get_templates(),
-        default=TEMPLATE_CHOICES[0][0],
+        choices=get_templates(),
+        default=get_templates()[0][0],
         max_length=255,
     )
     file_src = FilerFileField(
@@ -104,6 +103,8 @@ def __str__(self):
         return str(self.pk)
 
     def get_short_description(self):
+        if self.file_name:
+            return self.file_name
         if self.file_src and self.file_src.label:
             return self.file_src.label
         return ugettext('<file is missing>')
@@ -119,14 +120,10 @@ class Folder(CMSPlugin):
     """
     Renders a folder plugin to the selected tempalte
     """
-    TEMPLATE_CHOICES = [
-        ('default', _('Default')),
-    ]
-
     template = models.CharField(
         verbose_name=_('Template'),
-        choices=TEMPLATE_CHOICES + get_templates(),
-        default=TEMPLATE_CHOICES[0][0],
+        choices=get_templates(),
+        default=get_templates()[0][0],
         max_length=255,
     )
     folder_src = FilerFolderField(

djangocms_file/templates/djangocms_file/default/folder.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 
-{% for file in instance.get_files %}
+{% for file in folder_files %}
     <a href="{{ file.url }}"
         {% if instance.link_target %} target="{{ instance.link_target }}"{% endif %}
         {{ instance.attributes_str }}>
@@ -18,7 +18,7 @@
     # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video
     # https://github.com/divio/django-filer/blob/master/filer/models/filemodels.py
     {{ instance.folder_src }}
-    {{ instance.get_files }}
+    {{ instance.get_files }} or {{ folder_files }}
     # Available variables:
     {{ instance.template }}
     {{ instance.link_target }}