Skip to content

Commit d125841

Browse files
stefanfoulisstefanfoulis
committed
adds selectable style for folder plugin
1 parent e173e63 commit d125841

File tree

8 files changed

+415
-69
lines changed

8 files changed

+415
-69
lines changed

‎cmsplugin_filer_folder/cms_plugins.py

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
from os.path import join
21
from cms.plugin_pool import plugin_pool
32
from cms.plugin_base import CMSPluginBase
3+
from django.template import loader
4+
from django.template.loader import select_template
45
from django.utils.translation import ugettext_lazy as _
5-
from django.forms.models import ModelForm
6-
import models
7-
from django.conf import settings
8-
from django.forms.widgets import Media
6+
from . import models
7+
from .conf import settings
98
from filer.models.imagemodels import Image
109

1110

1211
class FilerFolderPlugin(CMSPluginBase):
1312
module = 'Filer'
1413
model = models.FilerFolder
1514
name = _("Folder")
16-
render_template = "cmsplugin_filer_folder/folder.html"
15+
TEMPLATE_NAME = 'cmsplugin_filer_folder/plugins/folder/%s.html'
16+
render_template = TEMPLATE_NAME % 'default'
1717
text_enabled = False
1818
admin_preview = False
1919

20+
fieldsets = (
21+
(None, {'fields': ['title', 'folder']}),
22+
)
23+
if settings.CMSPLUGIN_FILER_FOLDER_STYLE_CHOICES:
24+
fieldsets[0][1]['fields'].append('style')
25+
2026
def get_folder_files(self, folder, user):
2127
qs_files = folder.files.filter(image__isnull=True)
2228
if user.is_staff:
@@ -34,8 +40,12 @@ def get_folder_images(self, folder, user):
3440
def get_children(self, folder):
3541
return folder.get_children()
3642

37-
3843
def render(self, context, instance, placeholder):
44+
self.render_template = select_template((
45+
'cmsplugin_filer_folder/folder.html', # backwards compatibility. deprecated!
46+
self.TEMPLATE_NAME % instance.style,
47+
self.TEMPLATE_NAME % 'default')
48+
)
3949

4050
folder_files = self.get_folder_files(instance.folder,
4151
context['request'].user)

‎cmsplugin_filer_folder/conf.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#-*- coding: utf-8 -*-
2+
from django.conf import settings
3+
from django.utils.translation import ugettext_lazy as _
4+
from appconf import AppConf
5+
6+
7+
class CmspluginFilerFolderAppConf(AppConf):
8+
STYLE_CHOICES = (
9+
("list", _("List")),
10+
("slideshow", _("Slideshow"))
11+
)
12+
DEFAULT_STYLE = 'list'
13+
14+
def configure(self):
15+
# set DEFAULT_STYLE to '' if it is not in STYLE_CHOICES
16+
if not self.configured_data['DEFAULT_STYLE'] in [s for s, l in self.configured_data['STYLE_CHOICES']]:
17+
self.configured_data['DEFAULT_STYLE'] = ''
18+
return self.configured_data

‎cmsplugin_filer_folder/migrations/0002_auto__add_field_filerfolder_style.py

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# -*- coding: utf-8 -*-
2+
import datetime
3+
from south.db import db
4+
from south.v2 import SchemaMigration
5+
from django.db import models
6+
7+
8+
class Migration(SchemaMigration):
9+
10+
def forwards(self, orm):
11+
# Adding field 'FilerFolder.style'
12+
db.add_column(u'cmsplugin_filer_folder_filerfolder', 'style',
13+
self.gf('django.db.models.fields.CharField')(default='list', max_length=50),
14+
keep_default=False)
15+
16+
17+
def backwards(self, orm):
18+
# Deleting field 'FilerFolder.style'
19+
db.delete_column(u'cmsplugin_filer_folder_filerfolder', 'style')
20+
21+
22+
models = {
23+
u'auth.group': {
24+
'Meta': {'object_name': 'Group'},
25+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
26+
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
27+
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
28+
},
29+
u'auth.permission': {
30+
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
31+
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
32+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
33+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
34+
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
35+
},
36+
u'auth.user': {
37+
'Meta': {'object_name': 'User'},
38+
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
39+
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
40+
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
41+
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
42+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
43+
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
44+
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
45+
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
46+
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
47+
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
48+
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
49+
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
50+
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
51+
},
52+
'cms.cmsplugin': {
53+
'Meta': {'object_name': 'CMSPlugin'},
54+
'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
55+
'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
56+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
57+
'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
58+
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
59+
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
60+
'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
61+
'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
62+
'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
63+
'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
64+
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
65+
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
66+
},
67+
'cms.placeholder': {
68+
'Meta': {'object_name': 'Placeholder'},
69+
'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
70+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
71+
'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
72+
},
73+
u'cmsplugin_filer_folder.filerfolder': {
74+
'Meta': {'object_name': 'FilerFolder', '_ormbases': ['cms.CMSPlugin']},
75+
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
76+
'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['filer.Folder']"}),
77+
'style': ('django.db.models.fields.CharField', [], {'default': "'list'", 'max_length': '50'}),
78+
'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
79+
'view_option': ('django.db.models.fields.CharField', [], {'default': "'x'", 'max_length': '10'})
80+
},
81+
u'contenttypes.contenttype': {
82+
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
83+
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
84+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
85+
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
86+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
87+
},
88+
'filer.folder': {
89+
'Meta': {'ordering': "('name',)", 'unique_together': "(('parent', 'name'),)", 'object_name': 'Folder'},
90+
'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
91+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
92+
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
93+
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
94+
'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
95+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
96+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'filer_owned_folders'", 'null': 'True', 'to': u"orm['auth.User']"}),
97+
'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['filer.Folder']"}),
98+
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
99+
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
100+
'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
101+
}
102+
}
103+
104+
complete_apps = ['cmsplugin_filer_folder']

‎cmsplugin_filer_folder/migrations/0003_move_view_option_to_style.py

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# -*- coding: utf-8 -*-
2+
import datetime
3+
from south.db import db
4+
from south.v2 import DataMigration
5+
from django.db import models
6+
7+
class Migration(DataMigration):
8+
9+
def forwards(self, orm):
10+
for obj in orm['cmsplugin_filer_folder.filerfolder'].objects.all():
11+
obj.style = obj.view_option
12+
obj.save()
13+
14+
def backwards(self, orm):
15+
for obj in orm['cmsplugin_filer_folder.filerfolder'].objects.all():
16+
obj.view_option = obj.style
17+
obj.save()
18+
19+
models = {
20+
u'auth.group': {
21+
'Meta': {'object_name': 'Group'},
22+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
23+
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
24+
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
25+
},
26+
u'auth.permission': {
27+
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
28+
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
29+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
30+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
31+
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
32+
},
33+
u'auth.user': {
34+
'Meta': {'object_name': 'User'},
35+
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
36+
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
37+
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
38+
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
39+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
40+
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
41+
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
42+
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
43+
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
44+
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
45+
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
46+
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
47+
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
48+
},
49+
'cms.cmsplugin': {
50+
'Meta': {'object_name': 'CMSPlugin'},
51+
'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
52+
'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
53+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
54+
'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
55+
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
56+
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
57+
'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
58+
'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
59+
'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
60+
'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
61+
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
62+
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
63+
},
64+
'cms.placeholder': {
65+
'Meta': {'object_name': 'Placeholder'},
66+
'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
67+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
68+
'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
69+
},
70+
u'cmsplugin_filer_folder.filerfolder': {
71+
'Meta': {'object_name': 'FilerFolder', '_ormbases': ['cms.CMSPlugin']},
72+
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
73+
'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['filer.Folder']"}),
74+
'style': ('django.db.models.fields.CharField', [], {'default': "'list'", 'max_length': '50'}),
75+
'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
76+
'view_option': ('django.db.models.fields.CharField', [], {'default': "'x'", 'max_length': '10'})
77+
},
78+
u'contenttypes.contenttype': {
79+
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
80+
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
81+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
82+
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
83+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
84+
},
85+
'filer.folder': {
86+
'Meta': {'ordering': "('name',)", 'unique_together': "(('parent', 'name'),)", 'object_name': 'Folder'},
87+
'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
88+
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
89+
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
90+
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
91+
'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
92+
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
93+
'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'filer_owned_folders'", 'null': 'True', 'to': u"orm['auth.User']"}),
94+
'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['filer.Folder']"}),
95+
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
96+
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
97+
'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
98+
}
99+
}
100+
101+
complete_apps = ['cmsplugin_filer_folder']
102+
symmetrical = True

0 commit comments

Comments
 (0)