plugin rendering adaptions

Author: FinalAngel

djangocms_file/cms_plugins.py

@@ -14,13 +14,49 @@ class FilePlugin(CMSPluginBase):
     render_template = 'djangocms_file/file.html'
     text_enabled = True
 
+    fieldsets = [
+        (None, {
+            'fields': (
+                'file_src',
+                'file_name',
+            )
+        }),
+        (_('Advanced settings'), {
+            'classes': ('collapse',),
+            'fields': (
+                ('link_target', 'link_title'),
+                'show_file_size',
+                'attributes',
+            )
+        }),
+    ]
+
 
 class FolderPlugin(CMSPluginBase):
     model = Folder
     name = _('Folder')
-    render_template = 'djangocms_file/folder.html'
     text_enabled = True
 
+    fieldsets = [
+        (None, {
+            'fields': (
+                'template',
+                'folder_src',
+            )
+        }),
+        (_('Advanced settings'), {
+            'classes': ('collapse',),
+            'fields': (
+                'link_target',
+                'show_file_size',
+                'attributes',
+            )
+        }),
+    ]
+
+    def get_render_template(self, context, instance, placeholder):
+        return 'djangocms_file/{}/folder.html'.format(instance.template)
+
 
 plugin_pool.register_plugin(FilePlugin)
 plugin_pool.register_plugin(FolderPlugin)

djangocms_file/models.py

@@ -3,8 +3,6 @@
 Enables the user to add a "File" plugin that displays a file wrapped by
 an <anchor> tag.
 """
-import os
-
 from django.db import models
 from django.conf import settings
 from django.utils.encoding import python_2_unicode_compatible
@@ -93,8 +91,7 @@ class File(CMSPlugin):
     def __str__(self):
         if self.file_src and self.file_src.label:
             return self.file_src.label
-        return str(self.file_name or self.pk)
-    # TODO file does not exist anymore
+        return ugettext('<file is missing>')
 
 
 @python_2_unicode_compatible
@@ -150,4 +147,6 @@ class Folder(CMSPlugin):
     )
 
     def __str__(self):
-        return ''
+        if self.folder_src and self.folder_src.label:
+            return self.folder_src.label
+        return ugettext('<folder is missing>')

djangocms_file/templates/djangocms_file/default/folder.html

@@ -0,0 +1,5 @@
+<ul>
+    <li>
+        test
+    </li>
+</ul>