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

Renamed field css_header_title_color to title_color according to logo_color

pull/17/merge
Fabio Caccamo 2017-05-24 11:53:33 +02:00
parent 8a9842c219
commit ed34055290
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin_interface/admin.py
View File

@ -21,11 +21,11 @@ class ThemeAdmin(admin.ModelAdmin):
}), }),
('Title', { ('Title', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('title', 'title_visible', ) 'fields': ('title', 'title_color', 'title_visible', )
}), }),
('Header', { ('Header', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('css_header_background_color', 'css_header_title_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', ),

19
admin_interface/migrations/0004_rename_title_color.py 100644
View File

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('admin_interface', '0003_add_logo_color'),
]
operations = [
migrations.RenameField(
model_name='theme',
old_name='css_header_title_color',
new_name='title_color',
),
]

2
admin_interface/models.py
View File

@ -51,6 +51,7 @@ class Theme(models.Model):
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_color = ColorField( blank = True, default = '#F5DD5D', help_text = '#F5DD5D', verbose_name = 'title color' )
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, help_text = '(leave blank to use the default Django logo)' ) logo = models.FileField( upload_to = 'admin-interface/logo/', blank = True, help_text = '(leave blank to use the default Django logo)' )
@ -58,7 +59,6 @@ class Theme(models.Model):
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_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' )

3
admin_interface/templates/admin_interface/css/admin-interface.css
View File

@ -4,7 +4,8 @@
} }
.admin-interface #branding h1 { .admin-interface #branding h1 {
color:{{ theme.css_header_title_color }}; color:{{ theme.title_color }};
}
.admin-interface #branding h1 .logo.default { .admin-interface #branding h1 .logo.default {
background-color: transparent; background-color: transparent;