Cleanup style pep8.

Except E501 line too long.
pull/2/head
nerobit 2015-11-26 04:20:50 +09:00
parent 40cf1daa84
commit 72863f2897
6 changed files with 79 additions and 88 deletions

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'

View File

@ -6,10 +6,10 @@ from admin_interface.models import Theme
class ThemeAdmin(admin.ModelAdmin): class ThemeAdmin(admin.ModelAdmin):
list_display = ('name', 'active', ) list_display = ('name', 'active', )
list_editable = ('active', ) list_editable = ('active', )
fieldsets = ( fieldsets = (
(None, { (None, {
'classes': ('wide', ), 'classes': ('wide', ),
@ -48,8 +48,7 @@ class ThemeAdmin(admin.ModelAdmin):
'fields': ('list_filter_dropdown', ) 'fields': ('list_filter_dropdown', )
}), }),
) )
save_on_top = True
admin.site.register(Theme, ThemeAdmin)
save_on_top = True
admin.site.register(Theme, ThemeAdmin)

View File

@ -7,12 +7,10 @@ from admin_interface.models import Theme
class AdminInterfaceConfig(AppConfig): class AdminInterfaceConfig(AppConfig):
name = 'admin_interface' name = 'admin_interface'
verbose_name = 'Admin Interface' verbose_name = 'Admin Interface'
def ready(self): def ready(self):
post_migrate.connect(Theme.post_migrate_handler, sender = self) post_migrate.connect(Theme.post_migrate_handler, sender=self)

View File

@ -10,101 +10,99 @@ import os
class Theme(models.Model): class Theme(models.Model):
@staticmethod @staticmethod
def post_migrate_handler(sender, **kwargs): def post_migrate_handler(sender, **kwargs):
Theme.get_or_create_default_theme() Theme.get_or_create_default_theme()
@staticmethod @staticmethod
def post_delete_handler(instance, **kwargs): def post_delete_handler(instance, **kwargs):
Theme.get_or_create_default_theme() Theme.get_or_create_default_theme()
@staticmethod @staticmethod
def post_save_handler(instance, created, **kwargs): def post_save_handler(instance, created, **kwargs):
instance.set_active(instance.active) instance.set_active(instance.active)
Theme.get_or_create_default_theme() Theme.get_or_create_default_theme()
@staticmethod @staticmethod
def get_or_create_default_theme(): def get_or_create_default_theme():
obj_active = (True if len(list(Theme.objects.filter(active = True))) == 0 else False) obj_active = (True if len(list(Theme.objects.filter(active=True))) == 0 else False)
obj, obj_created = Theme.objects.get_or_create(pk = '1', defaults = { 'active':obj_active }) obj, obj_created = Theme.objects.get_or_create(pk='1', defaults={'active': obj_active})
if not obj.logo: if not obj.logo:
obj.set_default_logo() obj.set_default_logo()
if not obj_created and obj_active: if not obj_created and obj_active:
obj.set_active(True) obj.set_active(True)
return (obj, obj_created, ) return (obj, obj_created, )
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(max_length=50, default='Django administration', blank=True)
title_visible = models.BooleanField( default = True, verbose_name = 'visible' ) title_visible = models.BooleanField(default=True, verbose_name='visible')
logo = models.FileField( upload_to = 'admin-interface/logo/', blank = True ) logo = models.FileField(upload_to='admin-interface/logo/', blank=True)
logo_visible = models.BooleanField( default = True, verbose_name = 'visible' ) logo_visible = models.BooleanField(default=True, verbose_name='visible')
css_header_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', verbose_name = 'background color' ) css_header_background_color = ColorField(blank=True, default='#0C4B33', help_text='#0C4B33', verbose_name='background color')
css_header_title_color = ColorField( blank = True, default = '#F5DD5D', help_text = '#F5DD5D', verbose_name = 'title color' ) css_header_title_color = ColorField(blank=True, default='#F5DD5D', help_text='#F5DD5D', verbose_name='title color')
css_header_text_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', verbose_name = 'text color' ) css_header_text_color = ColorField(blank=True, default='#44B78B', help_text='#44B78B', verbose_name='text color')
css_header_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'link color' ) css_header_link_color = ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', verbose_name='link color')
css_header_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', verbose_name = 'link hover color' ) css_header_link_hover_color = ColorField(blank=True, default='#C9F0DD', help_text='#C9F0DD', verbose_name='link hover color')
css_module_background_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', verbose_name = 'background color' ) css_module_background_color = ColorField(blank=True, default='#44B78B', help_text='#44B78B', verbose_name='background color')
css_module_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' ) css_module_text_color = ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', verbose_name='text color')
css_module_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'link color' ) css_module_link_color = ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', verbose_name='link color')
css_module_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', verbose_name = 'link hover color' ) css_module_link_hover_color = ColorField(blank=True, default='#C9F0DD', help_text='#C9F0DD', verbose_name='link hover color')
css_module_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' ) css_module_rounded_corners = models.BooleanField(default=True, verbose_name='rounded corners')
css_generic_link_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', verbose_name = 'link color' ) css_generic_link_color = ColorField(blank=True, default='#0C3C26', help_text='#0C3C26', verbose_name='link color')
css_generic_link_hover_color = ColorField( blank = True, default = '#156641', help_text = '#156641', verbose_name = 'link hover color' ) css_generic_link_hover_color = ColorField(blank=True, default='#156641', help_text='#156641', verbose_name='link hover color')
css_save_button_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', verbose_name = 'background color' ) css_save_button_background_color = ColorField(blank=True, default='#0C4B33', help_text='#0C4B33', verbose_name='background color')
css_save_button_background_hover_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', verbose_name = 'background hover color' ) css_save_button_background_hover_color = ColorField(blank=True, default='#0C3C26', help_text='#0C3C26', verbose_name='background hover color')
css_save_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' ) css_save_button_text_color = ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', verbose_name='text color')
css_delete_button_background_color = ColorField( blank = True, default = '#BA2121', help_text = '#BA2121', verbose_name = 'background color' ) css_delete_button_background_color = ColorField(blank=True, default='#BA2121', help_text='#BA2121', verbose_name='background color')
css_delete_button_background_hover_color = ColorField( blank = True, default = '#A41515', help_text = '#A41515', verbose_name = 'background hover color' ) css_delete_button_background_hover_color = ColorField(blank=True, default='#A41515', help_text='#A41515', verbose_name='background hover color')
css_delete_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' ) css_delete_button_text_color = ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', verbose_name='text color')
css = models.TextField( blank = True ) css = models.TextField(blank=True)
list_filter_dropdown = models.BooleanField( default = False ) list_filter_dropdown = models.BooleanField(default=False)
def set_active(self, value): def set_active(self, value):
if value: if value:
Theme.objects.exclude(pk = self.pk).update(active = False) Theme.objects.exclude(pk=self.pk).update(active=False)
Theme.objects.filter(pk = self.pk).update(active = True) Theme.objects.filter(pk=self.pk).update(active=True)
else: else:
Theme.objects.filter(pk = self.pk).update(active = False) Theme.objects.filter(pk=self.pk).update(active=False)
def set_default_logo(self): def set_default_logo(self):
logo_path = os.path.normpath(os.path.dirname(__file__) + '/data/logo-django.svg') logo_path = os.path.normpath(os.path.dirname(__file__) + '/data/logo-django.svg')
logo_file = open(logo_path) logo_file = open(logo_path)
self.logo = File(logo_file) self.logo = File(logo_file)
self.save() self.save()
logo_file.close() logo_file.close()
class Meta: class Meta:
app_label = 'admin_interface' app_label = 'admin_interface'
verbose_name = 'Theme' verbose_name = 'Theme'
verbose_name_plural = 'Themes' verbose_name_plural = 'Themes'
def __unicode__(self):
return unicode(u'%s' % (self.name, ))
post_delete.connect(Theme.post_delete_handler, sender = Theme)
post_save.connect(Theme.post_save_handler, sender = Theme)
def __unicode__(self):
return unicode(u'%s' % (self.name, ))
post_delete.connect(Theme.post_delete_handler, sender=Theme)
post_save.connect(Theme.post_save_handler, sender=Theme)

View File

@ -8,18 +8,16 @@ from admin_interface.models import Theme
register = template.Library() register = template.Library()
@register.assignment_tag(takes_context = True) @register.assignment_tag(takes_context=True)
def get_admin_interface_theme(context): def get_admin_interface_theme(context):
obj_qs = Theme.objects.filter(active = True)[:1] obj_qs = Theme.objects.filter(active=True)[:1]
obj_ls = list(obj_qs) obj_ls = list(obj_qs)
obj = None obj = None
if len(obj_ls): if len(obj_ls):
obj = obj_ls[0] obj = obj_ls[0]
else: else:
obj = Theme.get_or_create_default_theme() obj = Theme.get_or_create_default_theme()
return obj return obj

View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
__version__ = '0.1.0' __version__ = '0.1.0'