Compare commits

...

18 Commits

Author SHA1 Message Date
Fabio Caccamo d6f0e5b0da Merge pull request #50 from merwok-forks/add-french-translation
French translation
2019-01-08 17:02:26 +01:00
Éric Araujo 4cf0d8f1b9 add French translation 2019-01-07 11:27:14 -05:00
Éric Araujo cc9b470bfe fix translations 2019-01-07 11:25:55 -05:00
Fabio Caccamo 01d995b031 Added .mo files. 2019-01-07 10:31:52 +01:00
Fabio Caccamo c383adb9a0 Updated version. 2019-01-04 11:56:24 +01:00
Fabio Caccamo 4ad2d87020 Fixed imports order. 2019-01-04 11:56:07 +01:00
Fabio Caccamo 9284594901 Added italian localization. 2019-01-04 11:55:48 +01:00
Fabio Caccamo a3c469f032 Removed useless comment from spanish localization. 2019-01-04 11:55:29 +01:00
Fabio Caccamo 17f71ad803 Merge pull request #48 from softbutterfly/master
Added internationalization and spanish localization
2019-01-04 11:03:52 +01:00
Martín Josemaría 1913af4b7d translatable default title, fix import style in admin.py 2019-01-03 16:01:14 -05:00
Martín Josemaría 8c382f97d1 Removed fuzzy and old msgid for 'Environment' 2019-01-02 16:42:20 -05:00
Martín Josemaría 89fda153de Fix typo in 'Enviroment' fieldset label, added localization for help text in icon field 2019-01-01 21:34:40 -05:00
Martín Josemaría 3fc3fe5912 Update metadata in spanish PO file 2018-12-30 19:23:58 -05:00
Martín Josemaría acdb755071 Added internationalization and spanish localization 2018-12-30 18:47:18 -05:00
Fabio Caccamo c680bb5461 Updated version 2018-11-13 10:19:35 +01:00
Fabio Caccamo ce32a56cdf Fixed #44 - raw_id_fields issue with django 2.1 2018-11-13 10:19:24 +01:00
Fabio Caccamo 7137cbab08 Updated version. 2018-10-24 17:27:55 +02:00
Fabio Caccamo 3f7b1e54e9 Fixed #42 - Related modal does not dismiss on popup response. 2018-10-24 17:27:42 +02:00
15 changed files with 751 additions and 104 deletions
-1
View File
@@ -44,7 +44,6 @@ coverage.xml
*,cover *,cover
# Translations # Translations
*.mo
*.pot *.pot
# Django stuff: # Django stuff:
+14 -12
View File
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin from django.contrib import admin
from django.utils.translation import ugettext_lazy as _
from admin_interface.models import Theme from admin_interface.models import Theme
@@ -15,14 +16,14 @@ class ThemeAdmin(admin.ModelAdmin):
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('name', 'active', ) 'fields': ('name', 'active', )
}), }),
('Enviroment', { (_('Environment'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'env', 'env',
'env_visible', 'env_visible',
) )
}), }),
('Logo', { (_('Logo'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'logo', 'logo',
@@ -30,11 +31,11 @@ class ThemeAdmin(admin.ModelAdmin):
'logo_visible', 'logo_visible',
) )
}), }),
('Favicon', { (_('Favicon'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('favicon', ) 'fields': ('favicon', )
}), }),
('Title', { (_('Title'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'title', 'title',
@@ -42,7 +43,7 @@ class ThemeAdmin(admin.ModelAdmin):
'title_visible', 'title_visible',
) )
}), }),
('Header', { (_('Header'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'css_header_background_color', 'css_header_background_color',
@@ -51,7 +52,7 @@ class ThemeAdmin(admin.ModelAdmin):
'css_header_link_hover_color', 'css_header_link_hover_color',
) )
}), }),
('Breadcrumbs / Module headers', { (_('Breadcrumbs / Module headers'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'css_module_background_color', 'css_module_background_color',
@@ -61,14 +62,14 @@ class ThemeAdmin(admin.ModelAdmin):
'css_module_rounded_corners', 'css_module_rounded_corners',
) )
}), }),
('Generic Links', { (_('Generic Links'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'css_generic_link_color', 'css_generic_link_color',
'css_generic_link_hover_color', 'css_generic_link_hover_color',
) )
}), }),
('Save Buttons', { (_('Save Buttons'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'css_save_button_background_color', 'css_save_button_background_color',
@@ -76,7 +77,7 @@ class ThemeAdmin(admin.ModelAdmin):
'css_save_button_text_color', 'css_save_button_text_color',
) )
}), }),
('Delete Buttons', { (_('Delete Buttons'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'css_delete_button_background_color', 'css_delete_button_background_color',
@@ -84,7 +85,7 @@ class ThemeAdmin(admin.ModelAdmin):
'css_delete_button_text_color', 'css_delete_button_text_color',
) )
}), }),
('Related Modal', { (_('Related Modal'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'related_modal_active', 'related_modal_active',
@@ -93,11 +94,11 @@ class ThemeAdmin(admin.ModelAdmin):
'related_modal_rounded_corners', 'related_modal_rounded_corners',
) )
}), }),
('List Filter', { (_('List Filter'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('list_filter_dropdown', ) 'fields': ('list_filter_dropdown', )
}), }),
('Recent Actions', { (_('Recent Actions'), {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('recent_actions_visible', ) 'fields': ('recent_actions_visible', )
}), }),
@@ -105,4 +106,5 @@ class ThemeAdmin(admin.ModelAdmin):
save_on_top = True save_on_top = True
admin.site.register(Theme, ThemeAdmin) admin.site.register(Theme, ThemeAdmin)
+2 -1
View File
@@ -2,12 +2,13 @@
from django.apps import AppConfig from django.apps import AppConfig
from django.db.models.signals import post_migrate from django.db.models.signals import post_migrate
from django.utils.translation import ugettext_lazy as _
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):
Binary file not shown.
@@ -0,0 +1,187 @@
# This file is distributed under the same license as the
# django-admin-interface package.
#
# Translators:
# Martin Vuelta <martin.vuelta@softbutterfly.io>, 2018
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: django-admin-interface\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-07 11:23-0500\n"
"PO-Revision-Date: 2018-12-30 19:13-0500\n"
"Last-Translator: Martin Vuelta <martin.vuelta@softbutterfly.io>\n"
"Language-Team: Spanish <dev@softbutterfly.io>\n"
"Language: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: admin.py:19
msgid "Environment"
msgstr "Ambiente"
#: admin.py:26
msgid "Logo"
msgstr "Logo"
#: admin.py:34
msgid "Favicon"
msgstr "Favicon"
#: admin.py:38
msgid "Title"
msgstr "Título"
#: admin.py:46
msgid "Header"
msgstr "Encabezado"
#: admin.py:55
msgid "Breadcrumbs / Module headers"
msgstr "Breadcrumbs / Encabezados de módulos"
#: admin.py:65
msgid "Generic Links"
msgstr "Enlaces genéricos"
#: admin.py:72
msgid "Save Buttons"
msgstr "Botones de guardar"
#: admin.py:80
msgid "Delete Buttons"
msgstr "Botones de borrar"
#: admin.py:88
msgid "Related Modal"
msgstr "Modal para objetos relacionados"
#: admin.py:97
msgid "List Filter"
msgstr "Lista de filtros"
#: admin.py:101
msgid "Recent Actions"
msgstr "Acciones recientes"
#: apps.py:11
msgid "Admin Interface"
msgstr "Interfaz de administración"
#: models.py:54
msgid "name"
msgstr "Nombre"
#: models.py:57 models.py:220
msgid "active"
msgstr "Activo"
#: models.py:61 templates/admin/base_site.html:6
#: templates/admin/base_site.html:66
msgid "Django administration"
msgstr "Administración de Django"
#: models.py:63
msgid "title"
msgstr "Título"
#: models.py:69
msgid "title color"
msgstr "Color de título"
#: models.py:72 models.py:87 models.py:108 models.py:253
msgid "visible"
msgstr "Visible"
#: models.py:77
msgid "Leave blank to use the default Django logo"
msgstr "Dejar en blanco para usaer el logo por defecto de Django"
#: models.py:78
msgid "logo"
msgstr "logo"
#: models.py:84
msgid "logo color"
msgstr "color de logo"
#: models.py:92
msgid "(.ico|.png|.gif - 16x16|32x32 px)"
msgstr "Formatos ico, png o gif. Tamaños de 16x16 o 32x32 pixeles"
#: models.py:93
msgid "favicon"
msgstr "favicon"
#: models.py:96
msgid "Development"
msgstr "Desarrollo"
#: models.py:97
msgid "Testing"
msgstr "Pruebas"
#: models.py:98
msgid "Staging"
msgstr "Depliegue"
#: models.py:99
msgid "Production"
msgstr "Producción"
#: models.py:105
msgid "environment"
msgstr "ambiente"
#: models.py:115 models.py:140 models.py:181 models.py:200 models.py:226
msgid "background color"
msgstr "color de fondo"
#: models.py:121 models.py:146 models.py:193 models.py:212 models.py:216
msgid "text color"
msgstr "color de texto"
#: models.py:127 models.py:152 models.py:168
msgid "link color"
msgstr "color de enlace"
#: models.py:133 models.py:158 models.py:174
msgid "link hover color"
msgstr "color de enlace (hover)"
#: models.py:161 models.py:246
msgid "rounded corners"
msgstr "esquinas redondas"
#: models.py:187 models.py:206
msgid "background hover color"
msgstr "color de fondo (hover)"
#: models.py:243
msgid "background opacity"
msgstr "opacidad de fondo"
#: models.py:250
msgid "use dropdown"
msgstr "Usar lista desplegable"
#: models.py:262
msgid "Theme"
msgstr "Tema"
#: models.py:263
msgid "Themes"
msgstr "Temas"
#: templates/admin/filter.html:13
#: templates/admin_interface/dropdown_filter.html:4
#, python-format
msgid " By %(filter_title)s "
msgstr " Por %(filter_title)s "
#: templates/admin/popup_response.html:3
msgid "Popup closing..."
msgstr "Cerando popup..."
Binary file not shown.
@@ -0,0 +1,186 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-07 11:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: admin.py:19
msgid "Environment"
msgstr "Environnment"
#: admin.py:26
msgid "Logo"
msgstr "Logo"
#: admin.py:34
msgid "Favicon"
msgstr "Favicon"
#: admin.py:38
msgid "Title"
msgstr "Titre"
#: admin.py:46
msgid "Header"
msgstr "Bannière"
#: admin.py:55
msgid "Breadcrumbs / Module headers"
msgstr "Fil d'ariane / en-têtes de module"
#: admin.py:65
msgid "Generic Links"
msgstr "Liens génériques"
#: admin.py:72
msgid "Save Buttons"
msgstr "Boutons sauvegarder"
#: admin.py:80
msgid "Delete Buttons"
msgstr "Boutons supprimer"
#: admin.py:88
msgid "Related Modal"
msgstr "Modale pour objet reliés"
#: admin.py:97
msgid "List Filter"
msgstr "Filtre de liste"
#: admin.py:101
msgid "Recent Actions"
msgstr "Actions récentes"
#: apps.py:11
msgid "Admin Interface"
msgstr "Interface Admin"
#: models.py:54
msgid "name"
msgstr "nom"
#: models.py:57 models.py:220
msgid "active"
msgstr "actif"
#: models.py:61 templates/admin/base_site.html:6
#: templates/admin/base_site.html:66
msgid "Django administration"
msgstr "Administration Django"
#: models.py:63
msgid "title"
msgstr "titre"
#: models.py:69
msgid "title color"
msgstr "couleur du titre"
#: models.py:72 models.py:87 models.py:108 models.py:253
msgid "visible"
msgstr "visible"
#: models.py:77
msgid "Leave blank to use the default Django logo"
msgstr "Laisser vide pour utiliser le logo Django par défaut"
#: models.py:78
msgid "logo"
msgstr "logo"
#: models.py:84
msgid "logo color"
msgstr "couleur du logo"
#: models.py:92
msgid "(.ico|.png|.gif - 16x16|32x32 px)"
msgstr "(.ico|.png|.gif - 16x16|32x32 px)"
#: models.py:93
msgid "favicon"
msgstr "favicon"
#: models.py:96
msgid "Development"
msgstr "Développement"
#: models.py:97
msgid "Testing"
msgstr "Test"
#: models.py:98
msgid "Staging"
msgstr "Pré-prod"
#: models.py:99
msgid "Production"
msgstr "Production"
#: models.py:105
msgid "environment"
msgstr "environment"
#: models.py:115 models.py:140 models.py:181 models.py:200 models.py:226
msgid "background color"
msgstr "couleur d'arrière-plan"
#: models.py:121 models.py:146 models.py:193 models.py:212 models.py:216
msgid "text color"
msgstr "couleur du texte"
#: models.py:127 models.py:152 models.py:168
msgid "link color"
msgstr "couleur de lien"
#: models.py:133 models.py:158 models.py:174
msgid "link hover color"
msgstr "couleur de lien au survol"
#: models.py:161 models.py:246
msgid "rounded corners"
msgstr "coins arrondis"
#: models.py:187 models.py:206
msgid "background hover color"
msgstr "couleur de fond au survol"
#: models.py:243
msgid "background opacity"
msgstr "opacité de l'arrière-plan"
#: models.py:250
msgid "use dropdown"
msgstr "utiliser un menu déroulant"
#: models.py:262
msgid "Theme"
msgstr "Thème"
#: models.py:263
msgid "Themes"
msgstr "Thèmes"
#: templates/admin/filter.html:13
#: templates/admin_interface/dropdown_filter.html:4
#, python-format
msgid " By %(filter_title)s "
msgstr " Par %(filter_title)s "
#: templates/admin/popup_response.html:3
msgid "Popup closing..."
msgstr "Fermeture de la modale..."
Binary file not shown.
@@ -0,0 +1,187 @@
# This file is distributed under the same license as the
# django-admin-interface package.
#
# Translators:
# Fabio Caccamo, 2019
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: django-admin-interface\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-07 11:23-0500\n"
"PO-Revision-Date: 2019-01-04 11:00-0000\n"
"Last-Translator: Fabio Caccamo\n"
"Language-Team: Italian\n"
"Language: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: admin.py:19
msgid "Environment"
msgstr "Ambiente"
#: admin.py:26
msgid "Logo"
msgstr "Logo"
#: admin.py:34
msgid "Favicon"
msgstr "Favicon"
#: admin.py:38
msgid "Title"
msgstr "Titolo"
#: admin.py:46
msgid "Header"
msgstr "Header"
#: admin.py:55
msgid "Breadcrumbs / Module headers"
msgstr "Breadcrumbs / Header dei moduli"
#: admin.py:65
msgid "Generic Links"
msgstr "Link generici"
#: admin.py:72
msgid "Save Buttons"
msgstr "Pulsanti per salvare"
#: admin.py:80
msgid "Delete Buttons"
msgstr "Pulsanti per eliminare"
#: admin.py:88
msgid "Related Modal"
msgstr "Modale per gli oggetti correlati"
#: admin.py:97
msgid "List Filter"
msgstr "Filtro listato"
#: admin.py:101
msgid "Recent Actions"
msgstr "Azioni recenti"
#: apps.py:11
msgid "Admin Interface"
msgstr "Interfaccia di admin"
#: models.py:54
msgid "name"
msgstr "Nome"
#: models.py:57 models.py:220
msgid "active"
msgstr "Attivo"
#: models.py:61 templates/admin/base_site.html:6
#: templates/admin/base_site.html:66
msgid "Django administration"
msgstr "Amministrazione di Django"
#: models.py:63
msgid "title"
msgstr "Titolo"
#: models.py:69
msgid "title color"
msgstr "Colore del titolo"
#: models.py:72 models.py:87 models.py:108 models.py:253
msgid "visible"
msgstr "Visibile"
#: models.py:77
msgid "Leave blank to use the default Django logo"
msgstr "Lasciare vuoto per usare il logo Django di default"
#: models.py:78
msgid "logo"
msgstr "logo"
#: models.py:84
msgid "logo color"
msgstr "colore del logo"
#: models.py:92
msgid "(.ico|.png|.gif - 16x16|32x32 px)"
msgstr "Formato ico, png o gif. Dimensioni 16x16 o 32x32 px"
#: models.py:93
msgid "favicon"
msgstr "favicon"
#: models.py:96
msgid "Development"
msgstr "Sviluppo"
#: models.py:97
msgid "Testing"
msgstr "Testing"
#: models.py:98
msgid "Staging"
msgstr "Staging"
#: models.py:99
msgid "Production"
msgstr "Produzione"
#: models.py:105
msgid "environment"
msgstr "ambiente"
#: models.py:115 models.py:140 models.py:181 models.py:200 models.py:226
msgid "background color"
msgstr "colore di sfondo"
#: models.py:121 models.py:146 models.py:193 models.py:212 models.py:216
msgid "text color"
msgstr "color del testo"
#: models.py:127 models.py:152 models.py:168
msgid "link color"
msgstr "color dei link"
#: models.py:133 models.py:158 models.py:174
msgid "link hover color"
msgstr "color dei link in hover"
#: models.py:161 models.py:246
msgid "rounded corners"
msgstr "bordi arrotondati"
#: models.py:187 models.py:206
msgid "background hover color"
msgstr "colore di sfondo in hover"
#: models.py:243
msgid "background opacity"
msgstr "opacità dello sfondo"
#: models.py:250
msgid "use dropdown"
msgstr "Usa dropdown"
#: models.py:262
msgid "Theme"
msgstr "Tema"
#: models.py:263
msgid "Themes"
msgstr "Temi"
#: templates/admin/filter.html:13
#: templates/admin_interface/dropdown_filter.html:4
#, python-format
msgid " By %(filter_title)s "
msgstr " Per %(filter_title)s "
#: templates/admin/popup_response.html:3
msgid "Popup closing..."
msgstr "Chiusura popup..."
+145 -66
View File
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import models from django.db import models
from django.db.models.signals import post_delete, post_save from django.db.models.signals import post_delete, post_save
from django.utils.encoding import python_2_unicode_compatible, force_text from django.utils.encoding import python_2_unicode_compatible, force_text
from django.utils.translation import ugettext_lazy as _
from colorfield.fields import ColorField from colorfield.fields import ColorField
@@ -28,7 +28,6 @@ class Theme(models.Model):
@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)
@@ -49,105 +48,182 @@ class Theme(models.Model):
return obj return obj
name = models.CharField(max_length=50, default='Django') name = models.CharField(
active = models.BooleanField(default=True) max_length=50,
default='Django',
verbose_name=_('name'))
active = models.BooleanField(
default=True,
verbose_name=_('active'))
title = models.CharField( title = models.CharField(
max_length=50, default='Django administration', blank=True) max_length=50,
default=_('Django administration'),
blank=True,
verbose_name=_('title'))
title_color = ColorField( title_color = ColorField(
blank=True, default='#F5DD5D', help_text='#F5DD5D', blank=True,
max_length=10, verbose_name='title color') default='#F5DD5D',
help_text='#F5DD5D',
max_length=10,
verbose_name=_('title color'))
title_visible = models.BooleanField( title_visible = models.BooleanField(
default=True, verbose_name='visible') default=True,
verbose_name=_('visible'))
logo = models.FileField( logo = models.FileField(
upload_to='admin-interface/logo/', blank=True, upload_to='admin-interface/logo/',
help_text='(leave blank to use the default Django logo)') blank=True,
help_text=_('Leave blank to use the default Django logo'),
verbose_name=_('logo'))
logo_color = ColorField( logo_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF', blank=True,
max_length=10, verbose_name='logo color') default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name=_('logo color'))
logo_visible = models.BooleanField( logo_visible = models.BooleanField(
default=True, verbose_name='visible') default=True,
verbose_name=_('visible'))
favicon = models.FileField( favicon = models.FileField(
upload_to='admin-interface/favicon/', blank=True, upload_to='admin-interface/favicon/',
help_text='(.ico|.png|.gif - 16x16|32x32 px)', verbose_name='favicon') blank=True,
help_text=_('(.ico|.png|.gif - 16x16|32x32 px)'),
verbose_name=_('favicon'))
env_choices = ( env_choices = (
('development', 'Development', ), ('development', _('Development'), ),
('testing', 'Testing', ), ('testing', _('Testing'), ),
('staging', 'Staging', ), ('staging', _('Staging'), ),
('production', 'Production', ), ('production', _('Production'), ),
) )
env = models.CharField( env = models.CharField(
max_length=50, max_length=50,
choices=env_choices, choices=env_choices,
default='development', verbose_name='enviroment') default='development',
verbose_name=_('environment'))
env_visible = models.BooleanField( env_visible = models.BooleanField(
default=True, verbose_name='visible') default=True,
verbose_name=_('visible'))
css_header_background_color = ColorField( css_header_background_color = ColorField(
blank=True, default='#0C4B33', help_text='#0C4B33', blank=True,
max_length=10, verbose_name='background color') default='#0C4B33',
help_text='#0C4B33',
max_length=10,
verbose_name=_('background color'))
css_header_text_color = ColorField( css_header_text_color = ColorField(
blank=True, default='#44B78B', help_text='#44B78B', blank=True,
max_length=10, verbose_name='text color') default='#44B78B',
help_text='#44B78B',
max_length=10,
verbose_name=_('text color'))
css_header_link_color = ColorField( css_header_link_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF', blank=True,
max_length=10, verbose_name='link color') default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name=_('link color'))
css_header_link_hover_color = ColorField( css_header_link_hover_color = ColorField(
blank=True, default='#C9F0DD', help_text='#C9F0DD', blank=True,
max_length=10, verbose_name='link hover color') default='#C9F0DD',
help_text='#C9F0DD',
max_length=10,
verbose_name=_('link hover color'))
css_module_background_color = ColorField( css_module_background_color = ColorField(
blank=True, default='#44B78B', help_text='#44B78B', blank=True,
max_length=10, verbose_name='background color') default='#44B78B',
help_text='#44B78B',
max_length=10,
verbose_name=_('background color'))
css_module_text_color = ColorField( css_module_text_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF', blank=True,
max_length=10, verbose_name='text color') default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name=_('text color'))
css_module_link_color = ColorField( css_module_link_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF', blank=True,
max_length=10, verbose_name='link color') default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name=_('link color'))
css_module_link_hover_color = ColorField( css_module_link_hover_color = ColorField(
blank=True, default='#C9F0DD', help_text='#C9F0DD', blank=True,
max_length=10, verbose_name='link hover color') default='#C9F0DD',
help_text='#C9F0DD',
max_length=10,
verbose_name=_('link hover color'))
css_module_rounded_corners = models.BooleanField( css_module_rounded_corners = models.BooleanField(
default=True, verbose_name='rounded corners') default=True,
verbose_name=_('rounded corners'))
css_generic_link_color = ColorField( css_generic_link_color = ColorField(
blank=True, default='#0C3C26', help_text='#0C3C26', blank=True,
max_length=10, verbose_name='link color') default='#0C3C26',
help_text='#0C3C26',
max_length=10,
verbose_name=_('link color'))
css_generic_link_hover_color = ColorField( css_generic_link_hover_color = ColorField(
blank=True, default='#156641', help_text='#156641', blank=True,
max_length=10, verbose_name='link hover color') default='#156641',
help_text='#156641',
max_length=10,
verbose_name=_('link hover color'))
css_save_button_background_color = ColorField( css_save_button_background_color = ColorField(
blank=True, default='#0C4B33', help_text='#0C4B33', blank=True,
max_length=10, verbose_name='background color') default='#0C4B33',
help_text='#0C4B33',
max_length=10,
verbose_name=_('background color'))
css_save_button_background_hover_color = ColorField( css_save_button_background_hover_color = ColorField(
blank=True, default='#0C3C26', help_text='#0C3C26', blank=True,
max_length=10, verbose_name='background hover color') default='#0C3C26',
help_text='#0C3C26',
max_length=10,
verbose_name=_('background hover color'))
css_save_button_text_color = ColorField( css_save_button_text_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF', blank=True,
max_length=10, verbose_name='text color') default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name=_('text color'))
css_delete_button_background_color = ColorField( css_delete_button_background_color = ColorField(
blank=True, default='#BA2121', help_text='#BA2121', blank=True,
max_length=10, verbose_name='background color') default='#BA2121',
help_text='#BA2121',
max_length=10,
verbose_name=_('background color'))
css_delete_button_background_hover_color = ColorField( css_delete_button_background_hover_color = ColorField(
blank=True, default='#A41515', help_text='#A41515', blank=True,
max_length=10, verbose_name='background hover color') default='#A41515',
help_text='#A41515',
max_length=10,
verbose_name=_('background hover color'))
css_delete_button_text_color = ColorField( css_delete_button_text_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF', blank=True,
max_length=10, verbose_name='text color') default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name=_('text color'))
css = models.TextField(blank=True) css = models.TextField(
blank=True,
verbose_name=_('text color'))
related_modal_active = models.BooleanField( related_modal_active = models.BooleanField(
default=True, verbose_name='active') default=True,
verbose_name=_('active'))
related_modal_background_color = ColorField( related_modal_background_color = ColorField(
blank=True, default='#000000', help_text='#000000', blank=True,
max_length=10, verbose_name='background color') 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%', ),
@@ -162,26 +238,29 @@ class Theme(models.Model):
related_modal_background_opacity = models.CharField( related_modal_background_opacity = models.CharField(
max_length=5, max_length=5,
choices=related_modal_background_opacity_choices, choices=related_modal_background_opacity_choices,
default='0.3', help_text='20%', verbose_name='background opacity') default='0.3',
help_text='20%',
verbose_name=_('background opacity'))
related_modal_rounded_corners = models.BooleanField( related_modal_rounded_corners = models.BooleanField(
default=True, verbose_name='rounded corners') default=True,
verbose_name=_('rounded corners'))
list_filter_dropdown = models.BooleanField( list_filter_dropdown = models.BooleanField(
default=False, verbose_name='use dropdown') default=False,
verbose_name=_('use dropdown'))
recent_actions_visible = models.BooleanField( recent_actions_visible = models.BooleanField(
default=True, verbose_name='visible') default=True,
verbose_name=_('visible'))
def set_active(self): def set_active(self):
self.active = True self.active = True
self.save() self.save()
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 __str__(self): def __str__(self):
return force_text(self.name) return force_text(self.name)
-1
View File
@@ -35,4 +35,3 @@ def check_installed_apps():
raise ImproperlyConfigured( raise ImproperlyConfigured(
'\'flat_responsive\' not needed since django 2.0, ' '\'flat_responsive\' not needed since django 2.0, '
'remove it from settings.INSTALLED_APPS.') 'remove it from settings.INSTALLED_APPS.')
+11 -3
View File
@@ -1,6 +1,11 @@
(function($) { if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
{
(function($) {
'use strict'; 'use strict';
$(function() {
$(document).ready(function() {
$('.cancel-link').click(function(e) { $('.cancel-link').click(function(e) {
e.preventDefault(); e.preventDefault();
var parentWindow = window.parent; var parentWindow = window.parent;
@@ -12,5 +17,8 @@
} }
return false; return false;
}); });
}); });
})(django.jQuery);
})(django.jQuery);
}
@@ -1,5 +1,5 @@
/* global opener */ (function() {
(function($) {
'use strict'; 'use strict';
function getModalWindowData() function getModalWindowData()
@@ -48,5 +48,5 @@
} }
break; break;
} }
})(django.jQuery);
})();
@@ -61,7 +61,7 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
// create a random parameter and append it to the src url to prevent it // create a random parameter and append it to the src url to prevent it
// this workaround doesn't work with related lookup url // this workaround doesn't work with related lookup url
var iframeSrcRandom = String(Math.round(Math.random() * 999999)); var iframeSrcRandom = String(Math.round(Math.random() * 999999));
if( iframeSrc.indexOf('?') === -1 ){ if (iframeSrc.indexOf('?') === -1) {
iframeSrc += '?_modal=' + iframeSrcRandom; iframeSrc += '?_modal=' + iframeSrcRandom;
} else { } else {
iframeSrc += '&_modal=' + iframeSrcRandom; iframeSrc += '&_modal=' + iframeSrcRandom;
@@ -86,7 +86,7 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
{ {
// set current window as iframe opener because // set current window as iframe opener because
// the callback is called on the opener window // the callback is called on the opener window
iframeEl.load(function(){ iframeEl.on('load', function() {
var iframeObj = $(this).get(0); var iframeObj = $(this).get(0);
var iframeWindow = iframeObj.contentWindow; var iframeWindow = iframeObj.contentWindow;
iframeWindow.opener = window; iframeWindow.opener = window;
@@ -130,4 +130,3 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
})(django.jQuery); })(django.jQuery);
} }
+1 -1
View File
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
__version__ = '0.8.0' __version__ = '0.9.0'