Compare commits

...

11 Commits

Author SHA1 Message Date
Fabio Caccamo 7c236c6641 Updated version and dependencies version 2016-04-13 17:25:54 +02:00
Fabio Caccamo 91b3809d61 Improved sorl-thumbnail AdminImageMixin widget layout 2016-04-12 18:03:50 +02:00
Fabio Caccamo f918551971 Fixed login logo overflow 2016-04-11 17:53:50 +02:00
Fabio Caccamo 149c95311f Updated README.md 2016-04-11 12:56:09 +02:00
Fabio Caccamo 858f077bd4 Updated README.md 2016-03-01 12:05:06 +01:00
Fabio Caccamo e46daa8f99 Updated README 2016-02-24 10:14:26 +01:00
Fabio Caccamo e3320b2034 Updated LICENSE 2016-02-24 10:12:32 +01:00
Fabio Caccamo 8991863fb1 Updated README 2016-02-24 10:11:54 +01:00
Fabio Caccamo 54f120c9ba Updated version 2016-02-24 10:04:49 +01:00
Fabio Caccamo 816c05bebd Cleaned whitespace 2016-02-24 10:04:35 +01:00
Fabio Caccamo 710370e903 Fixed Django 1.9 support 2016-02-24 10:03:19 +01:00
9 changed files with 73 additions and 56 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2015 Fabio Caccamo - fabio.caccamo@gmail.com
Copyright (c) 2016 Fabio Caccamo - fabio.caccamo@gmail.com
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
+4 -4
View File
@@ -4,8 +4,8 @@ django-admin-interface is a modern **flat admin interface customizable by the ad
You can use the builtin **django-theme** or create your own and **customize** **title, logo and colors**.
##Requirements
- Python 2.6, Python 2.7
- Django 1.6.5 through Django 1.8.4
- Python 2.6, Python 2.7, Python 3.4
- Django 1.6.5 through Django 1.9
##Installation
- Run `pip install django-admin-interface`
@@ -13,9 +13,9 @@ You can use the builtin **django-theme** or create your own and **customize** **
```python
INSTALLED_APPS = (
#...
'admin_interface',
'flat',
'colorfield',
'admin_interface',
#...
'django.contrib.admin',
#...
@@ -45,7 +45,7 @@ INSTALLED_APPS = (
##License
The MIT License (MIT)
Copyright (c) 2015 Fabio Caccamo - fabio.caccamo@gmail.com
Copyright (c) 2016 Fabio Caccamo - fabio.caccamo@gmail.com
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
+4 -4
View File
@@ -6,10 +6,10 @@ from admin_interface.models import Theme
class ThemeAdmin(admin.ModelAdmin):
list_display = ('name', 'active', )
list_editable = ('active', )
fieldsets = (
(None, {
'classes': ('wide', ),
@@ -48,8 +48,8 @@ class ThemeAdmin(admin.ModelAdmin):
'fields': ('list_filter_dropdown', )
}),
)
save_on_top = True
admin.site.register(Theme, ThemeAdmin)
+5 -7
View File
@@ -3,16 +3,14 @@
from django.apps import AppConfig
from django.db.models.signals import post_migrate
from admin_interface.models import Theme
class AdminInterfaceConfig(AppConfig):
name = 'admin_interface'
verbose_name = 'Admin Interface'
def ready(self):
from admin_interface.models import Theme
post_migrate.connect(Theme.post_migrate_handler, sender = self)
+32 -32
View File
@@ -10,101 +10,101 @@ import os
class Theme(models.Model):
@staticmethod
def post_migrate_handler(sender, **kwargs):
Theme.get_or_create_default_theme()
@staticmethod
def post_delete_handler(instance, **kwargs):
Theme.get_or_create_default_theme()
@staticmethod
def post_save_handler(instance, created, **kwargs):
instance.set_active(instance.active)
Theme.get_or_create_default_theme()
@staticmethod
def get_or_create_default_theme():
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 })
if not obj.logo:
obj.set_default_logo()
if not obj_created and obj_active:
obj.set_active(True)
return (obj, obj_created, )
name = models.CharField( max_length = 50, default = 'Django' )
active = models.BooleanField( default = True )
title = models.CharField( max_length = 50, default = 'Django administration', blank = True )
title_visible = models.BooleanField( default = True, verbose_name = 'visible' )
logo = models.FileField( upload_to = 'admin-interface/logo/', blank = True )
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_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_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_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_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_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_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_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_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_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' )
css = models.TextField( blank = True )
list_filter_dropdown = models.BooleanField( default = False )
def set_active(self, value):
if value:
Theme.objects.exclude(pk = self.pk).update(active = False)
Theme.objects.filter(pk = self.pk).update(active = True)
else:
Theme.objects.filter(pk = self.pk).update(active = False)
def set_default_logo(self):
logo_path = os.path.normpath(os.path.dirname(__file__) + '/data/logo-django.svg')
logo_file = open(logo_path)
self.logo = File(logo_file)
self.save()
logo_file.close()
class Meta:
app_label = 'admin_interface'
verbose_name = 'Theme'
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)
+21 -1
View File
@@ -220,9 +220,22 @@
min-width:320px !important;
}
.login #content {
padding:0px 30px 10px 30px !important;
}
/* same lateral padding as in logged view */
.login #header {
padding:10px 25px !important;
padding:15px 30px !important;
}
.login #branding h1 {
margin-right:0;
}
.login #branding h1 img.logo {
max-width:100%;
margin-right:0;
}
/* login button right aligned */
@@ -407,6 +420,13 @@
}
/* sorl-thumbnail - improved AdminImageMixin widget layout */
a.thumbnail + input[type="checkbox"] {
margin:10px 0;
}
/* ckeditor + light theme - https://github.com/Ikimea/ckeditor-light-theme */
.cke_inner, .cke_wysiwyg_frame {
@@ -10,16 +10,15 @@ register = template.Library()
@register.assignment_tag(takes_context = True)
def get_admin_interface_theme(context):
obj_qs = Theme.objects.filter(active = True)[:1]
obj_ls = list(obj_qs)
obj = None
if len(obj_ls):
obj = obj_ls[0]
else:
obj = Theme.get_or_create_default_theme()
return obj
+1 -1
View File
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
__version__ = '0.1.3'
__version__ = '0.1.5'
+1 -1
View File
@@ -18,7 +18,7 @@ setup(
keywords=['django', 'admin', 'interface', 'ui', 'flat', 'theme', 'custom'],
install_requires=[
'django-colorfield==0.1.10',
'django-flat-theme==1.1.2'
'django-flat-theme==1.1.3'
],
classifiers=[]
)