Briq
/
django-admin-interface
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated Python code to be PEP8 compliant

pull/32/head
Fabio Caccamo 2017-09-27 14:47:03 +02:00
parent 0fd8469d9a
commit c253617346
5 changed files with 141 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin_interface/__init__.py
View File

@ -3,4 +3,3 @@
from admin_interface.version import __version__ from admin_interface.version import __version__
default_app_config = 'admin_interface.apps.AdminInterfaceConfig' default_app_config = 'admin_interface.apps.AdminInterfaceConfig'

52
admin_interface/admin.py
View File

@ -17,7 +17,11 @@ class ThemeAdmin(admin.ModelAdmin):
}), }),
('Logo', { ('Logo', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('logo', 'logo_color', 'logo_visible', ) 'fields': (
'logo',
'logo_color',
'logo_visible',
)
}), }),
('Favicon', { ('Favicon', {
'classes': ('wide', ), 'classes': ('wide', ),
@ -25,31 +29,62 @@ class ThemeAdmin(admin.ModelAdmin):
}), }),
('Title', { ('Title', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('title', 'title_color', 'title_visible', ) 'fields': (
'title',
'title_color',
'title_visible',
)
}), }),
('Header', { ('Header', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('css_header_background_color', 'css_header_text_color', 'css_header_link_color', 'css_header_link_hover_color', ) 'fields': (
'css_header_background_color',
'css_header_text_color',
'css_header_link_color',
'css_header_link_hover_color',
)
}), }),
('Breadcrumbs / Module headers', { ('Breadcrumbs / Module headers', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('css_module_background_color', 'css_module_text_color', 'css_module_link_color', 'css_module_link_hover_color', 'css_module_rounded_corners', ) 'fields': (
'css_module_background_color',
'css_module_text_color',
'css_module_link_color',
'css_module_link_hover_color',
'css_module_rounded_corners',
)
}), }),
('Generic Links', { ('Generic Links', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('css_generic_link_color', 'css_generic_link_hover_color', ) 'fields': (
'css_generic_link_color',
'css_generic_link_hover_color',
)
}), }),
('Save Buttons', { ('Save Buttons', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('css_save_button_background_color', 'css_save_button_background_hover_color', 'css_save_button_text_color', ) 'fields': (
'css_save_button_background_color',
'css_save_button_background_hover_color',
'css_save_button_text_color',
)
}), }),
('Delete Buttons', { ('Delete Buttons', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('css_delete_button_background_color', 'css_delete_button_background_hover_color', 'css_delete_button_text_color', ) 'fields': (
'css_delete_button_background_color',
'css_delete_button_background_hover_color',
'css_delete_button_text_color',
)
}), }),
('Related Modal', { ('Related Modal', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('related_modal_active', 'related_modal_background_color', 'related_modal_background_opacity', 'related_modal_rounded_corners', ) 'fields': (
'related_modal_active',
'related_modal_background_color',
'related_modal_background_opacity',
'related_modal_rounded_corners',
)
}), }),
('List Filter', { ('List Filter', {
'classes': ('wide', ), 'classes': ('wide', ),
@ -64,4 +99,3 @@ class ThemeAdmin(admin.ModelAdmin):
save_on_top = True save_on_top = True
admin.site.register(Theme, ThemeAdmin) admin.site.register(Theme, ThemeAdmin)

3
admin_interface/apps.py
View File

@ -12,5 +12,6 @@ class AdminInterfaceConfig(AppConfig):
def ready(self): def ready(self):
from admin_interface.models import Theme from admin_interface.models import Theme
post_migrate.connect(Theme.post_migrate_handler, sender = self)
post_migrate.connect(
Theme.post_migrate_handler, sender=self)

136
admin_interface/models.py
View File

@ -14,28 +14,29 @@ class Theme(models.Model):
@staticmethod @staticmethod
def post_migrate_handler(sender, **kwargs): def post_migrate_handler(sender, **kwargs):
Theme.get_active_theme() theme = Theme.get_active_theme()
@staticmethod @staticmethod
def post_delete_handler(instance, **kwargs): def post_delete_handler(instance, **kwargs):
Theme.get_active_theme() theme = Theme.get_active_theme()
@staticmethod @staticmethod
def post_save_handler(instance, created, **kwargs): def post_save_handler(instance, created, **kwargs):
theme = instance theme = instance
if theme.active: if theme.active:
Theme.objects.exclude( pk = theme.pk ).update( active = False ) Theme.objects.exclude(pk=theme.pk).update(active=False)
Theme.get_active_theme() theme = Theme.get_active_theme()
@staticmethod @staticmethod
def get_active_theme(): def get_active_theme():
objs_active_qs = Theme.objects.filter( active = True ) objs_active_qs = Theme.objects.filter(active=True)
objs_active_ls = list(objs_active_qs) objs_active_ls = list(objs_active_qs)
objs_active_count = len(objs_active_ls) objs_active_count = len(objs_active_ls)
if objs_active_count == 0: if objs_active_count == 0:
default_obj, default_obj_created = Theme.objects.get_or_create(pk = '1', defaults = { 'active':True }) default_obj, default_obj_created = Theme.objects.get_or_create(
pk='1', defaults={'active': True})
if not default_obj_created: if not default_obj_created:
default_obj.set_active() default_obj.set_active()
obj = default_obj obj = default_obj
@ -49,45 +50,92 @@ class Theme(models.Model):
return obj return obj
name = models.CharField( max_length = 50, default = 'Django' ) name = models.CharField(max_length=50, default='Django')
active = models.BooleanField( default = True ) active = models.BooleanField(default=True)
title = models.CharField( max_length = 50, default = 'Django administration', blank = True ) title = models.CharField(
title_color = ColorField( blank = True, default = '#F5DD5D', help_text = '#F5DD5D', max_length = 10, verbose_name = 'title color' ) max_length=50, default='Django administration', blank=True)
title_visible = models.BooleanField( default = True, verbose_name = 'visible' ) title_color = ColorField(
blank=True, default='#F5DD5D', help_text='#F5DD5D',
max_length=10, verbose_name='title color')
title_visible = models.BooleanField(
default=True, verbose_name='visible')
logo = models.FileField( upload_to = 'admin-interface/logo/', blank = True, help_text = '(leave blank to use the default Django logo)' ) logo = models.FileField(
logo_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'logo color' ) upload_to='admin-interface/logo/', blank=True,
logo_visible = models.BooleanField( default = True, verbose_name = 'visible' ) help_text='(leave blank to use the default Django logo)')
logo_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF',
max_length=10, verbose_name='logo color')
logo_visible = models.BooleanField(
default=True, verbose_name='visible')
favicon = models.FileField( upload_to = 'admin-interface/favicon/', blank = True, help_text = '(.ico|.png|.gif - 16x16|32x32 px)', verbose_name = 'favicon' ) favicon = models.FileField(
upload_to='admin-interface/favicon/', blank=True,
help_text='(.ico|.png|.gif - 16x16|32x32 px)', verbose_name='favicon')
css_header_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', max_length = 10, verbose_name = 'background color' ) css_header_background_color = ColorField(
css_header_text_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', max_length = 10, verbose_name = 'text color' ) blank=True, default='#0C4B33', help_text='#0C4B33',
css_header_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'link color' ) max_length=10, verbose_name='background color')
css_header_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', max_length = 10, verbose_name = 'link hover color' ) css_header_text_color = ColorField(
blank=True, default='#44B78B', help_text='#44B78B',
max_length=10, verbose_name='text color')
css_header_link_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF',
max_length=10, verbose_name='link color')
css_header_link_hover_color = ColorField(
blank=True, default='#C9F0DD', help_text='#C9F0DD',
max_length=10, verbose_name='link hover color')
css_module_background_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', max_length = 10, verbose_name = 'background color' ) css_module_background_color = ColorField(
css_module_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'text color' ) blank=True, default='#44B78B', help_text='#44B78B',
css_module_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'link color' ) max_length=10, verbose_name='background color')
css_module_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', max_length = 10, verbose_name = 'link hover color' ) css_module_text_color = ColorField(
css_module_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' ) blank=True, default='#FFFFFF', help_text='#FFFFFF',
max_length=10, verbose_name='text color')
css_module_link_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF',
max_length=10, verbose_name='link color')
css_module_link_hover_color = ColorField(
blank=True, default='#C9F0DD', help_text='#C9F0DD',
max_length=10, verbose_name='link hover color')
css_module_rounded_corners = models.BooleanField(
default=True, verbose_name='rounded corners')
css_generic_link_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', max_length = 10, verbose_name = 'link color' ) css_generic_link_color = ColorField(
css_generic_link_hover_color = ColorField( blank = True, default = '#156641', help_text = '#156641', max_length = 10, verbose_name = 'link hover color' ) blank=True, default='#0C3C26', help_text='#0C3C26',
max_length=10, verbose_name='link color')
css_generic_link_hover_color = ColorField(
blank=True, default='#156641', help_text='#156641',
max_length=10, verbose_name='link hover color')
css_save_button_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', max_length = 10, verbose_name = 'background color' ) css_save_button_background_color = ColorField(
css_save_button_background_hover_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', max_length = 10, verbose_name = 'background hover color' ) blank=True, default='#0C4B33', help_text='#0C4B33',
css_save_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'text color' ) max_length=10, verbose_name='background color')
css_save_button_background_hover_color = ColorField(
blank=True, default='#0C3C26', help_text='#0C3C26',
max_length=10, verbose_name='background hover color')
css_save_button_text_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF',
max_length=10, verbose_name='text color')
css_delete_button_background_color = ColorField( blank = True, default = '#BA2121', help_text = '#BA2121', max_length = 10, verbose_name = 'background color' ) css_delete_button_background_color = ColorField(
css_delete_button_background_hover_color = ColorField( blank = True, default = '#A41515', help_text = '#A41515', max_length = 10, verbose_name = 'background hover color' ) blank=True, default='#BA2121', help_text='#BA2121',
css_delete_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'text color' ) max_length=10, verbose_name='background color')
css_delete_button_background_hover_color = ColorField(
blank=True, default='#A41515', help_text='#A41515',
max_length=10, verbose_name='background hover color')
css_delete_button_text_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF',
max_length=10, verbose_name='text color')
css = models.TextField( blank = True ) css = models.TextField(blank=True)
related_modal_active = models.BooleanField( default = True, verbose_name = 'active' ) related_modal_active = models.BooleanField(
related_modal_background_color = ColorField( blank = True, default = '#000000', help_text = '#000000', max_length = 10, verbose_name = 'background color' ) default=True, verbose_name='active')
related_modal_background_color = ColorField(
blank=True, default='#000000', help_text='#000000',
max_length=10, verbose_name='background color')
related_modal_background_opacity_choices = ( related_modal_background_opacity_choices = (
(0.1, '10%', ), (0.1, '10%', ),
(0.2, '20%', ), (0.2, '20%', ),
@ -99,11 +147,16 @@ class Theme(models.Model):
(0.8, '80%', ), (0.8, '80%', ),
(0.9, '90%', ), (0.9, '90%', ),
) )
related_modal_background_opacity = models.FloatField( choices = related_modal_background_opacity_choices, default = 0.2, help_text = '20%', verbose_name = 'background opacity' ) related_modal_background_opacity = models.FloatField(
related_modal_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' ) choices=related_modal_background_opacity_choices,
default=0.2, help_text='20%', verbose_name='background opacity')
related_modal_rounded_corners = models.BooleanField(
default=True, verbose_name='rounded corners')
list_filter_dropdown = models.BooleanField( default = False, verbose_name = 'use dropdown' ) list_filter_dropdown = models.BooleanField(
recent_actions_visible = models.BooleanField( default = True, verbose_name = 'visible' ) default=False, verbose_name='use dropdown')
recent_actions_visible = models.BooleanField(
default=True, verbose_name='visible')
def set_active(self): def set_active(self):
@ -121,6 +174,5 @@ class Theme(models.Model):
return force_text(self.name) return force_text(self.name)
post_delete.connect(Theme.post_delete_handler, sender = Theme) post_delete.connect(Theme.post_delete_handler, sender=Theme)
post_save.connect(Theme.post_save_handler, sender = Theme) post_save.connect(Theme.post_save_handler, sender=Theme)

5
admin_interface/templatetags/admin_interface_tags.py
View File

@ -13,7 +13,7 @@ except AttributeError:
assignment_tag = register.simple_tag assignment_tag = register.simple_tag
@assignment_tag(takes_context = True) @assignment_tag(takes_context=True)
def get_admin_interface_theme(context): def get_admin_interface_theme(context):
theme = None theme = None
@ -31,7 +31,6 @@ def get_admin_interface_theme(context):
return theme return theme
@assignment_tag(takes_context = True) @assignment_tag(takes_context=True)
def get_admin_interface_version(context): def get_admin_interface_version(context):
return __version__ return __version__