Compare commits

...

69 Commits

Author SHA1 Message Date
Fabio Caccamo 68a9974df8 Updated version. 2019-02-06 17:01:31 +01:00
Fabio Caccamo efb38d5825 Fixed #53 - Cancel button does not work 2019-02-06 17:01:17 +01:00
Fabio Caccamo a48d2175ba Removed django 2.2 from tox and travis. 2019-02-06 17:00:45 +01:00
Fabio Caccamo 8bffc8f82a Added postgres to tox and travis and included django 2.2. 2019-02-06 16:23:22 +01:00
Fabio Caccamo 1870635697 Removed extra white space. [ci skip] 2019-02-06 16:22:27 +01:00
Fabio Caccamo 4e0c4a00e2 Fixed IntegrityError on postgres 2019-02-06 16:21:50 +01:00
Fabio Caccamo 4b055f7ffa Added missing migration - fixed #51 2019-01-11 15:08:52 +01:00
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
Fabio Caccamo cf76fd412e Updated version 2018-10-11 12:11:46 +02:00
Fabio Caccamo ab0afff087 Added automatic check of 3rd party installed apps according to django version. 2018-10-11 12:11:32 +02:00
Fabio Caccamo e3811e2609 Fixed delete modal not dismissed when clicking 'cancel' button. 2018-10-11 12:08:35 +02:00
Fabio Caccamo 47a3d66d5c Enforced django.jQuery usage in popup_response.js 2018-10-11 12:07:02 +02:00
Fabio Caccamo 2700b4ff12 Updated README [ci skip] 2018-10-10 15:51:06 +02:00
Fabio Caccamo 6a1897b95c Updated tests, tox and travis to support django 2.1 and python 3.7. 2018-10-10 15:48:43 +02:00
Fabio Caccamo e5768da21b Fixed tox and travis for django 2.1 testing. 2018-08-31 15:36:42 +02:00
Fabio Caccamo dc8efcbd6b Updated version. 2018-08-31 15:22:06 +02:00
Fabio Caccamo 01c4ad1f06 Added django 2.1 to tox and travis. 2018-08-31 15:21:54 +02:00
Fabio Caccamo 4a848948a0 Added modal to raw_id_fields #37 2018-08-31 15:21:30 +02:00
Fabio Caccamo a96a70400f Cleaned js code [ci skip] 2018-08-31 15:20:21 +02:00
Fabio Caccamo cc0d2a402b Update .gitattributes 2018-06-14 10:27:58 +02:00
Fabio Caccamo 415de9ca66 Update .gitattributes 2018-06-13 16:09:35 +02:00
Fabio Caccamo 7e57885988 Update .gitattributes 2018-06-13 16:04:18 +02:00
Fabio Caccamo 013dcedd37 Delete vendor.yml 2018-06-13 16:03:54 +02:00
Fabio Caccamo b011256370 Update vendor.yml 2018-06-13 15:59:07 +02:00
Fabio Caccamo 752ccbb603 Created vendor.yml 2018-06-13 12:39:14 +02:00
Fabio Caccamo 8612012783 Fixed README license link [ci skip] 2018-03-29 14:57:20 +02:00
Fabio Caccamo f78167b711 Fixed README license link [ci skip] 2018-03-29 14:55:47 +02:00
Fabio Caccamo ef9b7e6d1b Updated travis 2018-03-29 11:45:18 +02:00
Fabio Caccamo 748b95854e Updated tox 2018-03-29 11:38:04 +02:00
Fabio Caccamo 2f10c88375 AddAdded Django 1.11 to .travis 2018-03-07 10:22:20 +01:00
Fabio Caccamo 73c9a54d94 Updated version 2018-02-06 15:31:19 +01:00
Fabio Caccamo eff414b40c Removed old selector fixies 2018-02-06 15:31:09 +01:00
Fabio Caccamo ccbf76dc5a Improved jquery.ui.tabs compatibility 2018-02-06 15:30:29 +01:00
Fabio Caccamo 5b6e83751b Updated README [ci skip] 2018-02-05 12:37:02 +01:00
Fabio Caccamo 572294f646 Updated version 2018-02-05 12:24:54 +01:00
Fabio Caccamo 4e18d36c79 Added django-tabbed-admin style support 2018-02-05 12:24:42 +01:00
Fabio Caccamo ee9994231b Fixed selectors text overflow 2018-02-05 12:23:54 +01:00
Fabio Caccamo fb4cfdb772 Updated version 2018-02-01 14:52:56 +01:00
Fabio Caccamo 8535232598 Merge pull request #32 from founders4schools/django-20-simple-tag
Avoid deprecation warning about assignment_tag
2018-02-01 14:51:08 +01:00
Bruno Alla abbb666eae Avoid deprecation warning about assignment_tag
Even though the try/except is Django 2.0 compatible, it still
accesses the deprecated template tag, and therefore it emits a
warning in the console, whereas it's actually fixed.

I tried to swap the try and the catch, but it doesn't work:
`simple_tag` existed before 1.9 but in a non-compatible form.

I've changed the decorator name we use to match the new Django version,
it should make the codebase more future proof.
2018-02-01 13:35:54 +00:00
Fabio Caccamo d48fc882f1 Updated USWDS fixture [ci skip] 2018-01-31 16:38:08 +01:00
Fabio Caccamo f968bd9ffa Updated README [ci skip] 2018-01-31 16:37:36 +01:00
Fabio Caccamo c0592276de Updated README [ci skip] 2018-01-31 12:36:43 +01:00
Fabio Caccamo 451679d565 Updated version 2018-01-31 12:24:22 +01:00
Fabio Caccamo e579134152 Added enviroment display and customization 2018-01-31 12:24:08 +01:00
Fabio Caccamo 6e57cf558c Updated .gitignore [ci skip] 2018-01-31 12:12:01 +01:00
Fabio Caccamo d00428c30a Tested against django 2.0 2017-12-05 12:14:27 +01:00
Fabio Caccamo 9becccce39 Updated version 2017-11-23 12:10:32 +01:00
Fabio Caccamo 64a9e8371c Updated setup.py 2017-11-23 12:10:19 +01:00
Fabio Caccamo 8a85334f68 Changed related_modal_background_opacity field type from FloatField to CharField 2017-11-23 12:10:06 +01:00
Fabio Caccamo 41a5ba61c8 Fixed migrations pep8 compliance 2017-11-23 12:08:36 +01:00
Fabio Caccamo c780ccfbcf Added Requirements Status badge provided by https://requires.io/ [ci skip] 2017-10-18 15:52:42 +02:00
42 changed files with 1945 additions and 413 deletions
+2 -1
View File
@@ -1 +1,2 @@
admin_interface/static/ckeditor/* linguist-vendored
admin_interface/static/admin_interface/magnific-popup/* linguist-vendored=true
admin_interface/static/ckeditor/* linguist-vendored=true
+2 -1
View File
@@ -44,7 +44,6 @@ coverage.xml
*,cover
# Translations
*.mo
*.pot
# Django stuff:
@@ -55,3 +54,5 @@ docs/_build/
# PyBuilder
target/
screenshots
TODO.txt
+79 -18
View File
@@ -1,31 +1,92 @@
language: python
python: 3.5
env:
- TOX_ENV=py27-17
- TOX_ENV=py27-18
- TOX_ENV=py27-19
- TOX_ENV=py27-110
- TOX_ENV=py34-17
- TOX_ENV=py34-18
- TOX_ENV=py34-19
- TOX_ENV=py34-110
- TOX_ENV=py34-master
- TOX_ENV=py35-18
- TOX_ENV=py35-19
- TOX_ENV=py35-110
- TOX_ENV=py35-master
- TOX_ENV=py27-dj17-sqlite
- TOX_ENV=py27-dj17-postgres
- TOX_ENV=py27-dj18-sqlite
- TOX_ENV=py27-dj18-postgres
- TOX_ENV=py27-dj19-sqlite
- TOX_ENV=py27-dj19-postgres
- TOX_ENV=py27-dj110-sqlite
- TOX_ENV=py27-dj110-postgres
- TOX_ENV=py27-dj111-sqlite
- TOX_ENV=py27-dj111-postgres
- TOX_ENV=py34-dj17-sqlite
- TOX_ENV=py34-dj17-postgres
- TOX_ENV=py34-dj18-sqlite
- TOX_ENV=py34-dj18-postgres
- TOX_ENV=py34-dj19-sqlite
- TOX_ENV=py34-dj19-postgres
- TOX_ENV=py34-dj110-sqlite
- TOX_ENV=py34-dj110-postgres
- TOX_ENV=py34-dj111-sqlite
- TOX_ENV=py34-dj111-postgres
- TOX_ENV=py34-dj20-sqlite
- TOX_ENV=py34-dj20-postgres
- TOX_ENV=py35-dj18-sqlite
- TOX_ENV=py35-dj18-postgres
- TOX_ENV=py35-dj19-sqlite
- TOX_ENV=py35-dj19-postgres
- TOX_ENV=py35-dj110-sqlite
- TOX_ENV=py35-dj110-postgres
- TOX_ENV=py35-dj111-sqlite
- TOX_ENV=py35-dj111-postgres
- TOX_ENV=py35-dj20-sqlite
- TOX_ENV=py35-dj20-postgres
- TOX_ENV=py35-dj21-sqlite
- TOX_ENV=py35-dj21-postgres
matrix:
include:
- python: "3.6"
env: TOX_ENV=py36-111
env:
- TOX_ENV=py36-dj111-sqlite
- TOX_ENV=py36-dj111-postgres
- python: "3.6"
env: TOX_ENV=py36-master
env:
- TOX_ENV=py36-dj20-sqlite
- TOX_ENV=py36-dj20-postgres
- python: "3.6"
env:
- TOX_ENV=py36-dj21-sqlite
- TOX_ENV=py36-dj21-postgres
- python: "3.6"
env:
- TOX_ENV=py36-djmaster-sqlite
- TOX_ENV=py36-djmaster-postgres
- python: "3.7"
env:
- TOX_ENV=py37-dj20-sqlite
- TOX_ENV=py37-dj20-postgres
dist: xenial
language: python
sudo: required
- python: "3.7"
env:
- TOX_ENV=py37-dj21-sqlite
- TOX_ENV=py37-dj21-postgres
dist: xenial
language: python
sudo: required
- python: "3.7"
env:
- TOX_ENV=py37-djmaster-sqlite
- TOX_ENV=py37-djmaster-postgres
dist: xenial
language: python
sudo: required
allow_failures:
- env: TOX_ENV=py34-master
- env: TOX_ENV=py35-master
- env: TOX_ENV=py36-master
- env:
- TOX_ENV=py36-djmaster-sqlite
- TOX_ENV=py36-djmaster-postgres
- env:
- TOX_ENV=py37-djmaster-sqlite
- TOX_ENV=py37-djmaster-postgres
install:
- pip install tox
services:
- postgresql
before_script:
- psql -c 'create database admin_interface;' -U postgres
script:
- tox -e $TOX_ENV
sudo: false
+12 -5
View File
@@ -8,17 +8,24 @@
# django-admin-interface
django-admin-interface is a modern **responsive flat admin interface customizable by the admin itself**.
![django-admin-interface-preview](https://user-images.githubusercontent.com/1035294/35631521-64b0cab8-06a4-11e8-8f57-c04fdfbb7e8b.gif)
## Features
- Beautiful default **django-theme**
- Themes management and customization *(you can **customize admin title, logo and colors**)*
- Responsive
- List filter dropdown *(optional)*
- `NEW` **Related modal** *(instead of the old popup window, optional)*
- Style optimizations for: `django-ckeditor`, `django-modeltranslation`, `sorl-thumbnail`
- `NEW` **Enviroment label** *(development, testing, staging, production)*
- Style optimizations for:
- `django-ckeditor`
- `django-modeltranslation`
- `django-tabbed-admin`
- `sorl-thumbnail`
## Requirements
- Python 2.7, 3.4, 3.5, 3.6
- Django 1.7, 1.8, 1.9, 1.10, 1.11
- Python 2.7, 3.4, 3.5, 3.6, 3.7
- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
## Installation
- Run `pip install django-admin-interface`
@@ -27,7 +34,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
INSTALLED_APPS = (
#...
'admin_interface',
'flat_responsive',
'flat_responsive', # only if django version < 2.0
'flat', # only if django version < 1.9
'colorfield',
#...
@@ -93,4 +100,4 @@ You can use [django-apptemplates](https://github.com/bittner/django-apptemplates
---
## License
Released under [MIT License](LICENSE).
Released under [MIT License](LICENSE.txt).
+14 -4
View File
@@ -6,6 +6,9 @@ django-admin-interface
django-admin-interface is a modern **responsive flat admin interface
customizable by the admin itself**.
|django-admin-interface_preview|
---------------------------------
Features
--------
@@ -14,19 +17,24 @@ Features
- Responsive
- List filter dropdown *(optional)*
- ``NEW`` **Related modal** (instead of the old popup window, optional)
- Style optimizations for: ``django-ckeditor``, ``django-modeltranslation``, ``sorl-thumbnail``
- ``NEW`` **Enviroment label** (development, testing, staging, production)
- Style optimizations for:
- `django-ckeditor`
- `django-modeltranslation`
- `django-tabbed-admin`
- `sorl-thumbnail`
Requirements
------------
- Python 2.7, 3.4, 3.5, 3.6
- Django 1.7, 1.8, 1.9, 1.10, 1.11
- Python 2.7, 3.4, 3.5, 3.6, 3.7
- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
Installation
------------
- Run ``pip install django-admin-interface``
- Add ``admin_interface``, ``flat_responsive``, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin``
- Add ``admin_interface``, ``flat_responsive`` *(only if django version < 2.0)*, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin``
- Run ``python manage.py migrate``
- Run ``python manage.py collectstatic``
- Restart your application server
@@ -133,6 +141,8 @@ Released under **MIT License**.
.. |License| image:: https://img.shields.io/pypi/l/django-admin-interface.svg
.. |django-admin-interface_preview| image:: https://user-images.githubusercontent.com/1035294/35631521-64b0cab8-06a4-11e8-8f57-c04fdfbb7e8b.gif
.. |django-admin-interface_login| image:: https://cloud.githubusercontent.com/assets/1035294/11240233/55c8d4ba-8df1-11e5-9568-00fdc987ede8.gif
.. |django-admin-interface_dashboard| image:: https://cloud.githubusercontent.com/assets/1035294/11240239/627c0362-8df1-11e5-81fa-216366a5d8da.gif
+20 -11
View File
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from django.contrib import admin
from django.utils.translation import ugettext_lazy as _
from admin_interface.models import Theme
@@ -15,7 +16,14 @@ class ThemeAdmin(admin.ModelAdmin):
'classes': ('wide', ),
'fields': ('name', 'active', )
}),
('Logo', {
(_('Environment'), {
'classes': ('wide', ),
'fields': (
'env',
'env_visible',
)
}),
(_('Logo'), {
'classes': ('wide', ),
'fields': (
'logo',
@@ -23,11 +31,11 @@ class ThemeAdmin(admin.ModelAdmin):
'logo_visible',
)
}),
('Favicon', {
(_('Favicon'), {
'classes': ('wide', ),
'fields': ('favicon', )
}),
('Title', {
(_('Title'), {
'classes': ('wide', ),
'fields': (
'title',
@@ -35,7 +43,7 @@ class ThemeAdmin(admin.ModelAdmin):
'title_visible',
)
}),
('Header', {
(_('Header'), {
'classes': ('wide', ),
'fields': (
'css_header_background_color',
@@ -44,7 +52,7 @@ class ThemeAdmin(admin.ModelAdmin):
'css_header_link_hover_color',
)
}),
('Breadcrumbs / Module headers', {
(_('Breadcrumbs / Module headers'), {
'classes': ('wide', ),
'fields': (
'css_module_background_color',
@@ -54,14 +62,14 @@ class ThemeAdmin(admin.ModelAdmin):
'css_module_rounded_corners',
)
}),
('Generic Links', {
(_('Generic Links'), {
'classes': ('wide', ),
'fields': (
'css_generic_link_color',
'css_generic_link_hover_color',
)
}),
('Save Buttons', {
(_('Save Buttons'), {
'classes': ('wide', ),
'fields': (
'css_save_button_background_color',
@@ -69,7 +77,7 @@ class ThemeAdmin(admin.ModelAdmin):
'css_save_button_text_color',
)
}),
('Delete Buttons', {
(_('Delete Buttons'), {
'classes': ('wide', ),
'fields': (
'css_delete_button_background_color',
@@ -77,7 +85,7 @@ class ThemeAdmin(admin.ModelAdmin):
'css_delete_button_text_color',
)
}),
('Related Modal', {
(_('Related Modal'), {
'classes': ('wide', ),
'fields': (
'related_modal_active',
@@ -86,11 +94,11 @@ class ThemeAdmin(admin.ModelAdmin):
'related_modal_rounded_corners',
)
}),
('List Filter', {
(_('List Filter'), {
'classes': ('wide', ),
'fields': ('list_filter_dropdown', )
}),
('Recent Actions', {
(_('Recent Actions'), {
'classes': ('wide', ),
'fields': ('recent_actions_visible', )
}),
@@ -98,4 +106,5 @@ class ThemeAdmin(admin.ModelAdmin):
save_on_top = True
admin.site.register(Theme, ThemeAdmin)
+4 -1
View File
@@ -2,16 +2,19 @@
from django.apps import AppConfig
from django.db.models.signals import post_migrate
from django.utils.translation import ugettext_lazy as _
class AdminInterfaceConfig(AppConfig):
name = 'admin_interface'
verbose_name = 'Admin Interface'
verbose_name = _('Admin Interface')
def ready(self):
from admin_interface import settings
from admin_interface.models import Theme
settings.check_installed_apps()
post_migrate.connect(
Theme.post_migrate_handler, sender=self)
@@ -4,12 +4,12 @@
"fields": {
"name": "USWDS",
"active": true,
"title": "Site administration",
"title": "Django administration",
"title_color": "#FFFFFF",
"title_visible": true,
"title_visible": false,
"logo": "",
"logo_color": "#FFFFFF",
"logo_visible": false,
"logo_visible": true,
"css_header_background_color": "#112E51",
"css_header_text_color": "#FFFFFF",
"css_header_link_color": "#FFFFFF",
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..."
+161 -27
View File
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import colorfield.fields
@@ -14,33 +16,165 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Theme',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(default=b'Django', max_length=50)),
('active', models.BooleanField(default=True)),
('title', models.CharField(default=b'Django administration', max_length=50, blank=True)),
('title_visible', models.BooleanField(default=True, verbose_name=b'visible')),
('logo', models.FileField(upload_to=b'admin-interface/logo/', blank=True)),
('logo_visible', models.BooleanField(default=True, verbose_name=b'visible')),
('css_header_background_color', colorfield.fields.ColorField(default=b'#0C4B33', help_text=b'#0C4B33', max_length=10, verbose_name=b'background color', blank=True)),
('css_header_title_color', colorfield.fields.ColorField(default=b'#F5DD5D', help_text=b'#F5DD5D', max_length=10, verbose_name=b'title color', blank=True)),
('css_header_text_color', colorfield.fields.ColorField(default=b'#44B78B', help_text=b'#44B78B', max_length=10, verbose_name=b'text color', blank=True)),
('css_header_link_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'link color', blank=True)),
('css_header_link_hover_color', colorfield.fields.ColorField(default=b'#C9F0DD', help_text=b'#C9F0DD', max_length=10, verbose_name=b'link hover color', blank=True)),
('css_module_background_color', colorfield.fields.ColorField(default=b'#44B78B', help_text=b'#44B78B', max_length=10, verbose_name=b'background color', blank=True)),
('css_module_text_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'text color', blank=True)),
('css_module_link_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'link color', blank=True)),
('css_module_link_hover_color', colorfield.fields.ColorField(default=b'#C9F0DD', help_text=b'#C9F0DD', max_length=10, verbose_name=b'link hover color', blank=True)),
('css_module_rounded_corners', models.BooleanField(default=True, verbose_name=b'rounded corners')),
('css_generic_link_color', colorfield.fields.ColorField(default=b'#0C3C26', help_text=b'#0C3C26', max_length=10, verbose_name=b'link color', blank=True)),
('css_generic_link_hover_color', colorfield.fields.ColorField(default=b'#156641', help_text=b'#156641', max_length=10, verbose_name=b'link hover color', blank=True)),
('css_save_button_background_color', colorfield.fields.ColorField(default=b'#0C4B33', help_text=b'#0C4B33', max_length=10, verbose_name=b'background color', blank=True)),
('css_save_button_background_hover_color', colorfield.fields.ColorField(default=b'#0C3C26', help_text=b'#0C3C26', max_length=10, verbose_name=b'background hover color', blank=True)),
('css_save_button_text_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'text color', blank=True)),
('css_delete_button_background_color', colorfield.fields.ColorField(default=b'#BA2121', help_text=b'#BA2121', max_length=10, verbose_name=b'background color', blank=True)),
('css_delete_button_background_hover_color', colorfield.fields.ColorField(default=b'#A41515', help_text=b'#A41515', max_length=10, verbose_name=b'background hover color', blank=True)),
('css_delete_button_text_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'text color', blank=True)),
('css', models.TextField(blank=True)),
('list_filter_dropdown', models.BooleanField(default=False)),
('id',
models.AutoField(
verbose_name='ID',
serialize=False,
auto_created=True,
primary_key=True)),
('name',
models.CharField(
default=b'Django',
max_length=50)),
('active',
models.BooleanField(
default=True)),
('title',
models.CharField(
default=b'Django administration',
max_length=50,
blank=True)),
('title_visible',
models.BooleanField(
default=True,
verbose_name=b'visible')),
('logo',
models.FileField(
upload_to=b'admin-interface/logo/',
blank=True)),
('logo_visible',
models.BooleanField(
default=True,
verbose_name=b'visible')),
('css_header_background_color',
colorfield.fields.ColorField(
default=b'#0C4B33',
help_text=b'#0C4B33',
max_length=10,
verbose_name=b'background color',
blank=True)),
('css_header_title_color',
colorfield.fields.ColorField(
default=b'#F5DD5D',
help_text=b'#F5DD5D',
max_length=10,
verbose_name=b'title color',
blank=True)),
('css_header_text_color',
colorfield.fields.ColorField(
default=b'#44B78B',
help_text=b'#44B78B',
max_length=10,
verbose_name=b'text color',
blank=True)),
('css_header_link_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'link color',
blank=True)),
('css_header_link_hover_color',
colorfield.fields.ColorField(
default=b'#C9F0DD',
help_text=b'#C9F0DD',
max_length=10,
verbose_name=b'link hover color',
blank=True)),
('css_module_background_color',
colorfield.fields.ColorField(
default=b'#44B78B',
help_text=b'#44B78B',
max_length=10,
verbose_name=b'background color',
blank=True)),
('css_module_text_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'text color',
blank=True)),
('css_module_link_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'link color',
blank=True)),
('css_module_link_hover_color',
colorfield.fields.ColorField(
default=b'#C9F0DD',
help_text=b'#C9F0DD',
max_length=10,
verbose_name=b'link hover color',
blank=True)),
('css_module_rounded_corners',
models.BooleanField(
default=True,
verbose_name=b'rounded corners')),
('css_generic_link_color',
colorfield.fields.ColorField(
default=b'#0C3C26',
help_text=b'#0C3C26',
max_length=10,
verbose_name=b'link color',
blank=True)),
('css_generic_link_hover_color',
colorfield.fields.ColorField(
default=b'#156641',
help_text=b'#156641',
max_length=10,
verbose_name=b'link hover color',
blank=True)),
('css_save_button_background_color',
colorfield.fields.ColorField(
default=b'#0C4B33',
help_text=b'#0C4B33',
max_length=10,
verbose_name=b'background color',
blank=True)),
('css_save_button_background_hover_color',
colorfield.fields.ColorField(
default=b'#0C3C26',
help_text=b'#0C3C26',
max_length=10,
verbose_name=b'background hover color',
blank=True)),
('css_save_button_text_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'text color',
blank=True)),
('css_delete_button_background_color',
colorfield.fields.ColorField(
default=b'#BA2121',
help_text=b'#BA2121',
max_length=10,
verbose_name=b'background color',
blank=True)),
('css_delete_button_background_hover_color',
colorfield.fields.ColorField(
default=b'#A41515',
help_text=b'#A41515',
max_length=10,
verbose_name=b'background hover color',
blank=True)),
('css_delete_button_text_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'text color',
blank=True)),
('css',
models.TextField(
blank=True)),
('list_filter_dropdown',
models.BooleanField(
default=False)),
],
options={
'verbose_name': 'Theme',
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
import colorfield.fields
@@ -15,26 +17,44 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='theme',
name='list_filter_dropdown',
field=models.BooleanField(default=False, verbose_name=b'use dropdown'),
field=models.BooleanField(
default=False,
verbose_name=b'use dropdown'),
),
migrations.AddField(
model_name='theme',
name='related_modal_active',
field=models.BooleanField(default=True, verbose_name=b'active'),
field=models.BooleanField(
default=True,
verbose_name=b'active'),
),
migrations.AddField(
model_name='theme',
name='related_modal_background_color',
field=colorfield.fields.ColorField(blank=True, default=b'#000000', help_text=b'#000000', max_length=10, verbose_name=b'background color'),
field=colorfield.fields.ColorField(
blank=True,
default=b'#000000',
help_text=b'#000000',
max_length=10,
verbose_name=b'background color'),
),
migrations.AddField(
model_name='theme',
name='related_modal_background_opacity',
field=models.FloatField(choices=[(0.1, b'10%'), (0.2, b'20%'), (0.3, b'30%'), (0.4, b'40%'), (0.5, b'50%'), (0.6, b'60%'), (0.7, b'70%'), (0.8, b'80%'), (0.9, b'90%')], default=0.2, help_text=b'20%', verbose_name=b'background opacity'),
field=models.FloatField(
choices=[
(0.1, b'10%'), (0.2, b'20%'), (0.3, b'30%'),
(0.4, b'40%'), (0.5, b'50%'), (0.6, b'60%'),
(0.7, b'70%'), (0.8, b'80%'), (0.9, b'90%')],
default=0.2,
help_text=b'20%',
verbose_name=b'background opacity'),
),
migrations.AddField(
model_name='theme',
name='related_modal_rounded_corners',
field=models.BooleanField(default=True, verbose_name=b'rounded corners'),
field=models.BooleanField(
default=True,
verbose_name=b'rounded corners'),
),
]
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import colorfield.fields
from django.db import migrations, models
@@ -15,11 +17,19 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='theme',
name='logo_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='logo color'),
field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='logo color'),
),
migrations.AlterField(
model_name='theme',
name='logo',
field=models.FileField(blank=True, help_text='(leave blank to use the default Django logo)', upload_to='admin-interface/logo/'),
field=models.FileField(
blank=True,
help_text='(leave blank to use the default Django logo)',
upload_to='admin-interface/logo/'),
),
]
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.1 on 2017-05-23 15:37
from __future__ import unicode_literals
from django.db import migrations, models
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='theme',
name='recent_actions_visible',
field=models.BooleanField(default=True, verbose_name='visible'),
field=models.BooleanField(
default=True,
verbose_name='visible'),
),
]
+143 -28
View File
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.2 on 2017-06-09 14:52
from __future__ import unicode_literals
import colorfield.fields
from django.db import migrations, models
@@ -16,136 +17,250 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='theme',
name='css_delete_button_background_color',
field=colorfield.fields.ColorField(blank=True, default='#BA2121', help_text='#BA2121', max_length=10, verbose_name='background color'),
field=colorfield.fields.ColorField(
blank=True,
default='#BA2121',
help_text='#BA2121',
max_length=10,
verbose_name='background color'),
),
migrations.AlterField(
model_name='theme',
name='css_delete_button_background_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#A41515', help_text='#A41515', max_length=10, verbose_name='background hover color'),
field=colorfield.fields.ColorField(
blank=True,
default='#A41515',
help_text='#A41515',
max_length=10,
verbose_name='background hover color'),
),
migrations.AlterField(
model_name='theme',
name='css_delete_button_text_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='text color'),
field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='text color'),
),
migrations.AlterField(
model_name='theme',
name='css_generic_link_color',
field=colorfield.fields.ColorField(blank=True, default='#0C3C26', help_text='#0C3C26', max_length=10, verbose_name='link color'),
field=colorfield.fields.ColorField(
blank=True,
default='#0C3C26',
help_text='#0C3C26',
max_length=10,
verbose_name='link color'),
),
migrations.AlterField(
model_name='theme',
name='css_generic_link_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#156641', help_text='#156641', max_length=10, verbose_name='link hover color'),
field=colorfield.fields.ColorField(
blank=True,
default='#156641',
help_text='#156641',
max_length=10,
verbose_name='link hover color'),
),
migrations.AlterField(
model_name='theme',
name='css_header_background_color',
field=colorfield.fields.ColorField(blank=True, default='#0C4B33', help_text='#0C4B33', max_length=10, verbose_name='background color'),
field=colorfield.fields.ColorField(
blank=True,
default='#0C4B33',
help_text='#0C4B33',
max_length=10,
verbose_name='background color'),
),
migrations.AlterField(
model_name='theme',
name='css_header_link_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='link color'),
field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='link color'),
),
migrations.AlterField(
model_name='theme',
name='css_header_link_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#C9F0DD', help_text='#C9F0DD', max_length=10, verbose_name='link hover color'),
field=colorfield.fields.ColorField(
blank=True,
default='#C9F0DD',
help_text='#C9F0DD',
max_length=10,
verbose_name='link hover color'),
),
migrations.AlterField(
model_name='theme',
name='css_header_text_color',
field=colorfield.fields.ColorField(blank=True, default='#44B78B', help_text='#44B78B', max_length=10, verbose_name='text color'),
field=colorfield.fields.ColorField(
blank=True,
default='#44B78B',
help_text='#44B78B',
max_length=10,
verbose_name='text color'),
),
migrations.AlterField(
model_name='theme',
name='css_module_background_color',
field=colorfield.fields.ColorField(blank=True, default='#44B78B', help_text='#44B78B', max_length=10, verbose_name='background color'),
field=colorfield.fields.ColorField(
blank=True,
default='#44B78B',
help_text='#44B78B',
max_length=10,
verbose_name='background color'),
),
migrations.AlterField(
model_name='theme',
name='css_module_link_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='link color'),
field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='link color'),
),
migrations.AlterField(
model_name='theme',
name='css_module_link_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#C9F0DD', help_text='#C9F0DD', max_length=10, verbose_name='link hover color'),
field=colorfield.fields.ColorField(
blank=True,
default='#C9F0DD',
help_text='#C9F0DD',
max_length=10,
verbose_name='link hover color'),
),
migrations.AlterField(
model_name='theme',
name='css_module_rounded_corners',
field=models.BooleanField(default=True, verbose_name='rounded corners'),
field=models.BooleanField(
default=True,
verbose_name='rounded corners'),
),
migrations.AlterField(
model_name='theme',
name='css_module_text_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='text color'),
field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='text color'),
),
migrations.AlterField(
model_name='theme',
name='css_save_button_background_color',
field=colorfield.fields.ColorField(blank=True, default='#0C4B33', help_text='#0C4B33', max_length=10, verbose_name='background color'),
field=colorfield.fields.ColorField(
blank=True,
default='#0C4B33',
help_text='#0C4B33',
max_length=10,
verbose_name='background color'),
),
migrations.AlterField(
model_name='theme',
name='css_save_button_background_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#0C3C26', help_text='#0C3C26', max_length=10, verbose_name='background hover color'),
field=colorfield.fields.ColorField(
blank=True,
default='#0C3C26',
help_text='#0C3C26',
max_length=10,
verbose_name='background hover color'),
),
migrations.AlterField(
model_name='theme',
name='css_save_button_text_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='text color'),
field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='text color'),
),
migrations.AlterField(
model_name='theme',
name='list_filter_dropdown',
field=models.BooleanField(default=False, verbose_name='use dropdown'),
field=models.BooleanField(
default=False,
verbose_name='use dropdown'),
),
migrations.AlterField(
model_name='theme',
name='logo_visible',
field=models.BooleanField(default=True, verbose_name='visible'),
field=models.BooleanField(
default=True,
verbose_name='visible'),
),
migrations.AlterField(
model_name='theme',
name='name',
field=models.CharField(default='Django', max_length=50),
field=models.CharField(
default='Django',
max_length=50),
),
migrations.AlterField(
model_name='theme',
name='related_modal_active',
field=models.BooleanField(default=True, verbose_name='active'),
field=models.BooleanField(
default=True,
verbose_name='active'),
),
migrations.AlterField(
model_name='theme',
name='related_modal_background_color',
field=colorfield.fields.ColorField(blank=True, default='#000000', help_text='#000000', max_length=10, verbose_name='background color'),
field=colorfield.fields.ColorField(
blank=True,
default='#000000',
help_text='#000000',
max_length=10,
verbose_name='background color'),
),
migrations.AlterField(
model_name='theme',
name='related_modal_background_opacity',
field=models.FloatField(choices=[(0.1, '10%'), (0.2, '20%'), (0.3, '30%'), (0.4, '40%'), (0.5, '50%'), (0.6, '60%'), (0.7, '70%'), (0.8, '80%'), (0.9, '90%')], default=0.2, help_text='20%', verbose_name='background opacity'),
field=models.FloatField(
choices=[
(0.1, '10%'), (0.2, '20%'), (0.3, '30%'),
(0.4, '40%'), (0.5, '50%'), (0.6, '60%'),
(0.7, '70%'), (0.8, '80%'), (0.9, '90%')],
default=0.2,
help_text='20%',
verbose_name='background opacity'),
),
migrations.AlterField(
model_name='theme',
name='related_modal_rounded_corners',
field=models.BooleanField(default=True, verbose_name='rounded corners'),
field=models.BooleanField(
default=True,
verbose_name='rounded corners'),
),
migrations.AlterField(
model_name='theme',
name='title',
field=models.CharField(blank=True, default='Django administration', max_length=50),
field=models.CharField(
blank=True,
default='Django administration',
max_length=50),
),
migrations.AlterField(
model_name='theme',
name='title_color',
field=colorfield.fields.ColorField(blank=True, default='#F5DD5D', help_text='#F5DD5D', max_length=10, verbose_name='title color'),
field=colorfield.fields.ColorField(
blank=True,
default='#F5DD5D',
help_text='#F5DD5D',
max_length=10,
verbose_name='title color'),
),
migrations.AlterField(
model_name='theme',
name='title_visible',
field=models.BooleanField(default=True, verbose_name='visible'),
field=models.BooleanField(
default=True,
verbose_name='visible'),
),
]
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2017-08-24 10:49
from __future__ import unicode_literals
from django.db import migrations, models
@@ -15,6 +15,10 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='theme',
name='favicon',
field=models.FileField(blank=True, help_text='(.ico|.png|.gif - 16x16|32x32 px)', upload_to='admin-interface/favicon/', verbose_name='favicon'),
field=models.FileField(
blank=True,
help_text='(.ico|.png|.gif - 16x16|32x32 px)',
upload_to='admin-interface/favicon/',
verbose_name='favicon'),
),
]
@@ -0,0 +1,28 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('admin_interface', '0007_add_favicon'),
]
operations = [
migrations.AlterField(
model_name='theme',
name='related_modal_background_opacity',
field=models.CharField(
choices=[
('0.1', '10%'), ('0.2', '20%'), ('0.3', '30%'),
('0.4', '40%'), ('0.5', '50%'), ('0.6', '60%'),
('0.7', '70%'), ('0.8', '80%'), ('0.9', '90%')],
default='0.3',
help_text='20%',
max_length=5,
verbose_name='background opacity'),
),
]
@@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('admin_interface', '0008_change_related_modal_background_opacity_type'),
]
operations = [
migrations.AddField(
model_name='theme',
name='env',
field=models.CharField(choices=[('development', 'Development'), ('testing', 'Testing'), ('staging', 'Staging'), ('production', 'Production')], default='development', max_length=50, verbose_name='enviroment'),
),
migrations.AddField(
model_name='theme',
name='env_visible',
field=models.BooleanField(default=True, verbose_name='visible'),
),
]
@@ -0,0 +1,45 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('admin_interface', '0009_add_enviroment'),
]
operations = [
migrations.AlterField(
model_name='theme',
name='active',
field=models.BooleanField(default=True, verbose_name='active'),
),
migrations.AlterField(
model_name='theme',
name='css',
field=models.TextField(blank=True, verbose_name='text color'),
),
migrations.AlterField(
model_name='theme',
name='env',
field=models.CharField(choices=[('development', 'Development'), ('testing', 'Testing'), ('staging', 'Staging'), ('production', 'Production')], default='development', max_length=50, verbose_name='environment'),
),
migrations.AlterField(
model_name='theme',
name='logo',
field=models.FileField(blank=True, help_text='Leave blank to use the default Django logo', upload_to='admin-interface/logo/', verbose_name='logo'),
),
migrations.AlterField(
model_name='theme',
name='name',
field=models.CharField(default='Django', max_length=50, verbose_name='name'),
),
migrations.AlterField(
model_name='theme',
name='title',
field=models.CharField(blank=True, default='Django administration', max_length=50, verbose_name='title'),
),
]
+170 -76
View File
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models
from django.db.models.signals import post_delete, post_save
from django.utils.encoding import python_2_unicode_compatible, force_text
from django.utils.translation import ugettext_lazy as _
from colorfield.fields import ColorField
@@ -28,17 +28,17 @@ class Theme(models.Model):
@staticmethod
def get_active_theme():
objs_active_qs = Theme.objects.filter(active=True)
objs_manager = Theme.objects
objs_active_qs = objs_manager.filter(active=True)
objs_active_ls = list(objs_active_qs)
objs_active_count = len(objs_active_ls)
if objs_active_count == 0:
default_obj, default_obj_created = Theme.objects.get_or_create(
pk='1', defaults={'active': True})
if not default_obj_created:
default_obj.set_active()
obj = default_obj
obj = objs_manager.all().first()
if obj:
obj.set_active()
else:
obj = objs_manager.create()
elif objs_active_count == 1:
obj = objs_active_ls[0]
@@ -49,125 +49,219 @@ class Theme(models.Model):
return obj
name = models.CharField(max_length=50, default='Django')
active = models.BooleanField(default=True)
name = models.CharField(
max_length=50,
default='Django',
verbose_name=_('name'))
active = models.BooleanField(
default=True,
verbose_name=_('active'))
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(
blank=True, default='#F5DD5D', help_text='#F5DD5D',
max_length=10, verbose_name='title color')
blank=True,
default='#F5DD5D',
help_text='#F5DD5D',
max_length=10,
verbose_name=_('title color'))
title_visible = models.BooleanField(
default=True, verbose_name='visible')
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)')
upload_to='admin-interface/logo/',
blank=True,
help_text=_('Leave blank to use the default Django logo'),
verbose_name=_('logo'))
logo_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF',
max_length=10, verbose_name='logo color')
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name=_('logo color'))
logo_visible = models.BooleanField(
default=True, verbose_name='visible')
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')
upload_to='admin-interface/favicon/',
blank=True,
help_text=_('(.ico|.png|.gif - 16x16|32x32 px)'),
verbose_name=_('favicon'))
env_choices = (
('development', _('Development'), ),
('testing', _('Testing'), ),
('staging', _('Staging'), ),
('production', _('Production'), ),
)
env = models.CharField(
max_length=50,
choices=env_choices,
default='development',
verbose_name=_('environment'))
env_visible = models.BooleanField(
default=True,
verbose_name=_('visible'))
css_header_background_color = ColorField(
blank=True, default='#0C4B33', help_text='#0C4B33',
max_length=10, verbose_name='background color')
blank=True,
default='#0C4B33',
help_text='#0C4B33',
max_length=10,
verbose_name=_('background color'))
css_header_text_color = ColorField(
blank=True, default='#44B78B', help_text='#44B78B',
max_length=10, verbose_name='text color')
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')
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')
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')
blank=True,
default='#44B78B',
help_text='#44B78B',
max_length=10,
verbose_name=_('background color'))
css_module_text_color = ColorField(
blank=True, default='#FFFFFF', help_text='#FFFFFF',
max_length=10, verbose_name='text color')
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')
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')
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')
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')
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')
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')
blank=True,
default='#0C4B33',
help_text='#0C4B33',
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')
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')
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')
blank=True,
default='#BA2121',
help_text='#BA2121',
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')
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')
blank=True,
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(
default=True, verbose_name='active')
default=True,
verbose_name=_('active'))
related_modal_background_color = ColorField(
blank=True, default='#000000', help_text='#000000',
max_length=10, verbose_name='background color')
blank=True,
default='#000000',
help_text='#000000',
max_length=10,
verbose_name=_('background color'))
related_modal_background_opacity_choices = (
(0.1, '10%', ),
(0.2, '20%', ),
(0.3, '30%', ),
(0.4, '40%', ),
(0.5, '50%', ),
(0.6, '60%', ),
(0.7, '70%', ),
(0.8, '80%', ),
(0.9, '90%', ),
('0.1', '10%', ),
('0.2', '20%', ),
('0.3', '30%', ),
('0.4', '40%', ),
('0.5', '50%', ),
('0.6', '60%', ),
('0.7', '70%', ),
('0.8', '80%', ),
('0.9', '90%', ),
)
related_modal_background_opacity = models.FloatField(
related_modal_background_opacity = models.CharField(
max_length=5,
choices=related_modal_background_opacity_choices,
default=0.2, help_text='20%', verbose_name='background opacity')
default='0.3',
help_text='20%',
verbose_name=_('background opacity'))
related_modal_rounded_corners = models.BooleanField(
default=True, verbose_name='rounded corners')
default=True,
verbose_name=_('rounded corners'))
list_filter_dropdown = models.BooleanField(
default=False, verbose_name='use dropdown')
default=False,
verbose_name=_('use dropdown'))
recent_actions_visible = models.BooleanField(
default=True, verbose_name='visible')
default=True,
verbose_name=_('visible'))
def set_active(self):
self.active = True
self.save()
class Meta:
app_label = 'admin_interface'
verbose_name = 'Theme'
verbose_name_plural = 'Themes'
verbose_name = _('Theme')
verbose_name_plural = _('Themes')
def __str__(self):
return force_text(self.name)
+37
View File
@@ -0,0 +1,37 @@
# -*- coding: utf-8 -*-
import django
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
def check_installed_apps():
dj_version = django.VERSION
installed_apps = settings.INSTALLED_APPS
if 'colorfield' not in installed_apps:
raise ImproperlyConfigured(
'\'colorfield\' needed, '
'add it to settings.INSTALLED_APPS.')
if dj_version < (1, 9):
if 'flat' not in installed_apps:
raise ImproperlyConfigured(
'\'flat\' needed before django 1.9, '
'add it to settings.INSTALLED_APPS.')
else:
if 'flat' in installed_apps:
raise ImproperlyConfigured(
'\'flat\' not needed since django 1.9, '
'remove it from settings.INSTALLED_APPS.')
if dj_version < (2, 0):
if 'flat_responsive' not in installed_apps:
raise ImproperlyConfigured(
'\'flat_responsive\' needed before django 2.0, '
'add it to settings.INSTALLED_APPS.')
else:
if 'flat_responsive' in installed_apps:
raise ImproperlyConfigured(
'\'flat_responsive\' not needed since django 2.0, '
'remove it from settings.INSTALLED_APPS.')
+18
View File
@@ -0,0 +1,18 @@
if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined') {
(function($) {
'use strict';
$(document).ready(function() {
$('.cancel-link').click(function(e) {
e.preventDefault();
var parentWindow = window.parent;
if (parentWindow && typeof(parentWindow.dismissRelatedObjectModal) === 'function' && parentWindow !== window) {
parentWindow.dismissRelatedObjectModal();
} else {
// fallback to default behavior
window.history.back();
}
return false;
});
});
})(django.jQuery);
}
@@ -1,45 +1,52 @@
/*global opener */
(function() {
'use strict';
var windowRef = window;
var windowName = windowRef.name;
var widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
//var windowNames = windowName.split('____');
//var widgetName = windowNames[(windowNames.length - 1)];
//widgetName = widgetName.replace(/^(change|add|delete|lookup)_/, '');
//console.log('dismiss modal and update widget with id: "' + widgetName + '"');
var modalRef = {};
var openerRef = windowRef.opener;
if(!openerRef){
openerRef = windowRef.parent;
modalRef = {
name: openerRef.id_to_windowname(widgetName),
close: function(){
openerRef.dismissRelatedObjectModal();
}
};
function getModalWindowData()
{
var windowRef = window;
var windowName = windowRef.name;
var widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
var modalRef = {};
var openerRef = windowRef.opener;
if (!openerRef) {
openerRef = windowRef.parent;
modalRef = {
name: openerRef.id_to_windowname(widgetName),
close: function(){
openerRef.dismissRelatedObjectModal();
}
};
}
return { opener:openerRef, modal:modalRef };
}
var modalData = getModalWindowData();
var modalRef = modalData['modal'];
var openerRef = modalData['opener'];
var initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);
switch(initData.action){
// console.log(initData);
switch (initData.action) {
case 'change':
if( typeof(openerRef.dismissChangeRelatedObjectPopup) == 'function' ){
if (typeof(openerRef.dismissChangeRelatedObjectPopup) === 'function') {
openerRef.dismissChangeRelatedObjectPopup(modalRef, initData.value, initData.obj, initData.new_value);
}
break;
case 'delete':
if( typeof(openerRef.dismissDeleteRelatedObjectPopup) == 'function' ){
if (typeof(openerRef.dismissDeleteRelatedObjectPopup) === 'function') {
openerRef.dismissDeleteRelatedObjectPopup(modalRef, initData.value);
}
break;
default:
if( typeof(openerRef.dismissAddRelatedObjectPopup) == 'function' ){
if (typeof(openerRef.dismissAddRelatedObjectPopup) === 'function') {
openerRef.dismissAddRelatedObjectPopup(modalRef, initData.value, initData.obj);
}
else if( typeof(openerRef.dismissAddAnotherPopup) == 'function' ){
else if (typeof(openerRef.dismissAddAnotherPopup) === 'function') {
// django 1.7 compatibility
openerRef.dismissAddAnotherPopup(modalRef, initData.value, initData.obj);
}
break;
}
})();
})();
@@ -1,23 +1,45 @@
if(typeof django !== 'undefined' && typeof django.jQuery !== 'undefined' )
if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
{
(function($) {
$(document).ready(function(){
// create the function that will close the modal
function dismissRelatedObjectModal()
function dismissModal()
{
// close the popup as modal
$.magnificPopup.close();
}
// assign the function to a global variable
// create the function that will close the modal
function dismissRelatedObjectModal()
{
dismissModal();
}
function dismissRelatedLookupModal(win, chosenId)
{
var windowRef = win;
var windowName = windowRef.name;
var widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
var widgetEl = $('#' + widgetName);
var widgetVal = widgetEl.val();
if (widgetEl.hasClass('vManyToManyRawIdAdminField') && Boolean(widgetVal)) {
widgetEl.val(widgetVal + ', ' + chosenId);
} else {
widgetEl.val(chosenId);
}
dismissModal();
}
// assign functions to global variables
window.dismissRelatedObjectModal = dismissRelatedObjectModal;
window.dismissRelatedLookupPopup = dismissRelatedLookupModal;
function presentRelatedObjectModal(e)
{
var href = ($(this).attr('href') || '');
if( href == '' ){
var linkEl = $(this);
var href = (linkEl.attr('href') || '');
if (href == '') {
return;
}
@@ -26,40 +48,57 @@ if(typeof django !== 'undefined' && typeof django.jQuery !== 'undefined' )
e.stopImmediatePropagation();
// remove focus from clicked link
$(this).blur();
linkEl.blur();
// use the clicked link id as iframe name
// it will be available as window.name in the loaded iframe
var iframeName = $(this).attr('id');
// var iframeName = String(window.name + '____' + $(this).attr('id'));
// console.log('open modal with name: "' + iframeName + '"');
// browsers stop loading nested iframes having the same src url
// create a random parameter and append it to the src url to prevent it
var iframeSrcRandom = String(Math.round(Math.random() * 999999));
var iframeName = linkEl.attr('id');
var iframeSrc = href;
// fix for django 1.7
if( iframeSrc.indexOf('_popup=1') == -1 ){
iframeSrc += '&_popup=1';
if (e.data.lookup !== true)
{
// browsers stop loading nested iframes having the same src url
// create a random parameter and append it to the src url to prevent it
// this workaround doesn't work with related lookup url
var iframeSrcRandom = String(Math.round(Math.random() * 999999));
if (iframeSrc.indexOf('?') === -1) {
iframeSrc += '?_modal=' + iframeSrcRandom;
} else {
iframeSrc += '&_modal=' + iframeSrcRandom;
}
}
iframeSrc += '&_modal=' + iframeSrcRandom;
// fix for django 1.7
if (iframeSrc.indexOf('_popup=1') === -1) {
if (iframeSrc.indexOf('?') === -1) {
iframeSrc += '?_popup=1';
} else {
iframeSrc += '&_popup=1';
}
}
// build the iframe html
// var iframeHTML = '<iframe id="related-modal" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>';
var iframeHTML = '<iframe id="related-modal-iframe" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>';
// create the iframe jquery element
var iframeEl = $(iframeHTML);
if (e.data.lookup === true)
{
// set current window as iframe opener because
// the callback is called on the opener window
iframeEl.on('load', function() {
var iframeObj = $(this).get(0);
var iframeWindow = iframeObj.contentWindow;
iframeWindow.opener = window;
});
}
// the modal css class
var iframeInternalModalClass = 'related-modal';
// if the current window is inside an iframe, it means that it is already in a modal,
// append an additional css class to the modal to offer more customization
if( window.top != window.self )
{
if (window.top != window.self) {
iframeInternalModalClass += ' related-modal__nested';
}
@@ -79,12 +118,15 @@ if(typeof django !== 'undefined' && typeof django.jQuery !== 'undefined' )
// django 1.7 compatibility
$('a.add-another').removeAttr('onclick');
$('a.add-another').click( presentRelatedObjectModal );
$('a.add-another').click({ lookup:false }, presentRelatedObjectModal);
// django 1.8 and above
$('a.related-widget-wrapper-link').click( presentRelatedObjectModal );
$('a.related-widget-wrapper-link').click({ lookup:false }, presentRelatedObjectModal);
// raw_id_fields support
$('a.related-lookup').unbind('click');
$('a.related-lookup').click({ lookup:true }, presentRelatedObjectModal);
});
})(django.jQuery);
}
}
@@ -19,8 +19,10 @@ https://github.com/fabiocaccamo/django-admin-interface
{% include "admin_interface/css/list-filter-dropdown.css" %}
{% include "admin_interface/css/recent-actions.css" %}
{% include "admin_interface/css/related-modal.css" %}
{% include "admin_interface/css/jquery.ui.tabs.css" %}
{% include "admin_interface/css/modeltranslation.css" %}
{% include "admin_interface/css/sorl-thumbnail.css" %}
{% include "admin_interface/css/tabbed-admin.css" %}
{% include "admin_interface/css/ckeditor.css" %}
{% include "admin_interface/css/tinymce.css" %}
@@ -64,4 +66,9 @@ https://github.com/fabiocaccamo/django-admin-interface
<span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span>
{% endif %}
</h1>
{% endblock %}
{% block welcome-msg %}
{% get_admin_interface_theme as theme %}
{% if theme.env_visible %}<span class="enviroment-label {{ theme.env }}"></span> - {% endif %}{{ block.super }}<br>
{% endblock %}
@@ -308,79 +308,28 @@ body.admin-interface .paginator a.showall:visited {
width: 100% !important;
flex: 0 1 auto;
}
.admin-interface .aligned .form-row input[type="file"] {
width: 100% !important;
}
}
/* improve responsive selector */
/* fix [stacked, not-stacked] equalize horizontal and vertical select padding for selector (stacked and not) */
/* fix [stacked, not-stacked] equalize horizontal and vertical select padding for selector */
.admin-interface .selector .selector-available select,
.admin-interface .selector .selector-chosen select {
padding: 7px 10px;
display: block;
}
/* fix [not-stacked] selector */
.admin-interface .selector:not(.stacked) {
width: auto;
margin-right: 10px;
/* fix [stacked, not-stacked] select options text overflow */
.admin-interface .selector .selector-available select option,
.admin-interface .selector .selector-chosen select option {
overflow: hidden;
text-overflow: ellipsis;
}
/* fix [not-stacked] equalize selectors height by adding the height of the .selector-available filter-bar */
.admin-interface .selector:not(.stacked) .selector-chosen select {
height: calc(46px + 17.2em) !important;
}
@media (max-width: 1024px){
.admin-interface .related-widget-wrapper-link + .selector:not(.stacked) {
width: 100%;
}
}
@media (min-width: 767px) and (max-width: 1124px){
.admin-interface .selector:not(.stacked) .selector-available,
.admin-interface .selector:not(.stacked) .selector-chosen {
width: 285px;
flex: 0 1 auto;
}
.admin-interface .selector:not(.stacked) .selector-filter {
display: flex;
align-items: center;
}
.admin-interface .selector:not(.stacked) .selector-filter label {
margin: 0;
}
.admin-interface .selector:not(.stacked) .selector-available input {
width: auto;
flex: 1 1;
}
.admin-interface .selector:not(.stacked) select {
width: 100%;
}
}
/* fix [not-stacked] in tabular inline context */
.admin-interface .tabular.inline-related .selector:not(.stacked) {
width: 795px;
float: none;
display: inline-block;
margin-right: 22px;
}
.admin-interface .tabular.inline-related .form-row .related-widget-wrapper-link:first-child {
float: right;
display: inline-block;
}
/* fix [stacked] in tabular inline context */
.admin-interface .tabular.inline-related .selector.stacked {
width: 480px;
float: none;
display: inline-block;
margin-right: 22px;
}
/* fix [stacked] chooser align center */
.admin-interface .selector.stacked .selector-chooser {
margin-left:calc(50% - 30px);
}
File diff suppressed because one or more lines are too long
@@ -0,0 +1,144 @@
/*
* jQuery UI CSS Framework
* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
* http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/base/jquery.ui.core.css
*/
/*
backward compatibility:
.ui-tabs-selected: jquery ui < 1.10
.ui-tabs-active classes jquery ui >= 1.10
*/
/* Layout helpers
----------------------------------*/
.ui-helper-hidden { display: none; }
.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
.ui-helper-clearfix { display: inline-block; }
/* required comment for clearfix to work in Opera \*/
* html .ui-helper-clearfix { height:1%; }
.ui-helper-clearfix { display:block; }
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
.ui-state-disabled { cursor: default !important; }
.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
/* http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/base/jquery.ui.tabs.css */
.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
.ui-tabs .ui-tabs-nav li.ui-tabs-active, .ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
.ui-tabs .ui-tabs-hide {
position: absolute;
display: none;
}
/* Custom tabs theme */
.admin-interface .ui-tabs {
padding: 0;
}
.admin-interface .ui-tabs,
.admin-interface .ui-tabs .ui-widget-header,
.admin-interface .ui-tabs .ui-widget-header .ui-state-default {
border: none;
background: transparent;
}
.admin-interface .ui-tabs .ui-tabs-nav {
padding: 10px 0 0 10px;
border-bottom: none;
}
.admin-interface .ui-tabs .ui-tabs-nav li {
margin: 0 0 0 -1px;
}
.admin-interface .ui-tabs .ui-tabs-nav li.required {
font-weight: bold;
}
.admin-interface .ui-tabs .ui-tabs-nav li a {
border: 1px solid #eeeeee;
background-color: #f8f8f8;
border-bottom: none;
color: #666666;
padding: 7px 14px 8px 14px;
margin-top: 1px;
-moz-border-radius-topright: 4px;
-webkit-border-top-right-radius: 4px;
-moz-border-radius-topleft: 4px;
-webkit-border-top-left-radius: 4px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
font-size: 12px;
text-transform: uppercase;
outline: none;
}
.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
padding: 8px 14px 8px 14px;
margin-top: 0px;
margin-bottom: -1px;
font-weight: bold;
background-color: #FFFFFF;
color: {{ theme.css_module_background_color }};
border-bottom: 1px solid #FFFFFF;
}
.admin-interface .ui-tabs .ui-tabs-panel {
border: 1px solid #eeeeee;
border-radius: 4px;
padding: 10px;
margin-bottom: 30px;
overflow: hidden;
}
.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-panel {
padding: 8px;
}
.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-nav {
padding-left: 4px;
}
.admin-interface .inline-group .tabular tr td {
vertical-align: bottom;
}
.admin-interface .inline-group .tabular tr.has_original td.original,
.admin-interface .inline-group .tabular tr td.delete {
vertical-align: top;
}
.admin-interface .inline-group .tabular .datetime > input {
margin-right: 5px;
}
.admin-interface .inline-group .tabular .datetime br {
display: none;
}
.admin-interface #changelist .row1:not(.selected):hover,
.admin-interface #changelist .row2:not(.selected):hover {
background: #f9f9f9;
}
.admin-interface .row2 {
background: #fcfcfc;
}
.admin-interface .row2 .ui-tabs .ui-tabs-nav li a {
background-color: #f5f5f5;
border: 1px solid #ebebeb;
}
.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
background-color: #fcfcfc;
border-bottom: 1px solid #fcfcfc;
}
@@ -1,65 +1,17 @@
/*
django-modeltranslation support
https://github.com/deschler/django-modeltranslation/pull/313/commits
https://github.com/deschler/django-modeltranslation
*/
.admin-interface #content h1 select {
text-transform:uppercase;
margin-left:15px;
text-transform: uppercase;
margin-left: 15px;
min-width: 50px;
}
.admin-interface .ui-tabs .ui-tabs-nav {
padding:10px 0 0 10px;
.admin-interface .ui-tabs .ui-tabs-panel[id^=tab_id_] {
border: none;
border-top: 1px solid #eeeeee;
padding: 0;
margin-bottom: 0;
}
.admin-interface .ui-tabs .ui-tabs-nav li {
margin-left:-1px;
}
.admin-interface .ui-tabs .ui-tabs-nav li a {
outline:none;
background-color:#f8f8f8;
border:1px solid #eeeeee;
border-bottom:none;
text-transform:uppercase;
padding:7px 14px 8px 14px;
margin-top:1px;
}
.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
padding:8px 14px 8px 14px;
margin-top:0px;
margin-bottom:-1px;
font-weight: bold;
background-color:#FFFFFF;
color:{{ theme.css_module_background_color }};
border-bottom:1px solid #FFFFFF;
}
.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-panel {
padding:8px;
}
.admin-interface #changelist .row1:not(.selected):hover,
.admin-interface #changelist .row2:not(.selected):hover {
background:#f9f9f9;
}
.admin-interface .row2 {
background:#fcfcfc;
}
.admin-interface .row2 .ui-tabs .ui-tabs-nav li a {
background-color:#f5f5f5;
border:1px solid #ebebeb;
}
.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
background-color:#fcfcfc;
border-bottom:1px solid #fcfcfc;
}
@@ -0,0 +1,37 @@
/*
django-tabbed-admin support
https://github.com/omji/django-tabbed-admin
*/
/* Hide tabs until ready */
/*
.admin-interface #tabs ul {
display: none;
}
.admin-interface #tabs ul.ui-tabs-nav {
display: block;
}
*/
.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .module.aligned:last-child {
margin-bottom: 0;
}
.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .module.aligned:last-child .form-row:last-child {
border-bottom: none;
}
@media (max-width: 350px){
.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .vTextField,
.admin-interface .inline-related .vTextField {
width: 17em;
}
}
@media (max-width: 767px){
/* fix horizontal overflow - responsive.css:563 */
.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .aligned .form-row > div:not([class]) {
width: 100% !important;
}
}
@@ -1,21 +1,20 @@
# -*- coding: utf-8 -*-
from django import template
from django import template, VERSION
from admin_interface.models import Theme
from admin_interface.version import __version__
register = template.Library()
try:
assignment_tag = register.assignment_tag
except AttributeError:
assignment_tag = register.simple_tag
if VERSION < (1, 9):
simple_tag = register.assignment_tag
else:
simple_tag = register.simple_tag
@assignment_tag(takes_context=True)
@simple_tag(takes_context=True)
def get_admin_interface_theme(context):
theme = None
request = context.get('request', None)
@@ -31,6 +30,6 @@ def get_admin_interface_theme(context):
return theme
@assignment_tag(takes_context=False)
@simple_tag(takes_context=False)
def get_admin_interface_version():
return __version__
+1 -1
View File
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
__version__ = '0.5.8'
__version__ = '0.9.2'
+8 -4
View File
@@ -4,18 +4,19 @@
from setuptools import find_packages, setup
import os
# import pypandoc
exec(open('admin_interface/version.py').read())
github_url = 'https://github.com/fabiocaccamo'
package_name = 'django-admin-interface'
package_path = os.path.abspath(os.path.dirname(__file__))
# long_description = pypandoc.convert(os.path.join(package_path, 'README.md'), 'rst')
long_description_file_path = os.path.join(package_path, 'README.rst')
long_description = ''
with open(long_description_file_path) as f:
long_description = f.read()
try:
with open(long_description_file_path) as f:
long_description = f.read()
except IOError:
pass
setup(
name=package_name,
@@ -44,6 +45,8 @@ setup(
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
@@ -54,6 +57,7 @@ setup(
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Topic :: Software Development :: Build Tools',
],
license='MIT',
+55 -11
View File
@@ -9,24 +9,46 @@ SECRET_KEY = 'django-admin-interface'
ALLOWED_HOSTS = ['*']
# Application definition
INSTALLED_APPS = [
'admin_interface',
'flat_responsive',
'flat', #if django version < 1.9
'colorfield',
]
if django.VERSION < (1, 9):
# ONLY if django version < 1.9
INSTALLED_APPS += [
'flat',
]
if django.VERSION < (2, 0):
# ONLY if django version < 2.0
INSTALLED_APPS += [
'flat_responsive',
]
INSTALLED_APPS += [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.messages',
'django.contrib.sessions',
]
MIDDLEWARE_CLASSES = [
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
]
if django.VERSION < (2, 0):
MIDDLEWARE_CLASSES = [
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware'
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
]
else:
MIDDLEWARE = [
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
]
TEMPLATES = [{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -35,17 +57,39 @@ TEMPLATES = [{
'OPTIONS': {
'context_processors': [
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
]
},
},]
DATABASES = {
'default': {
database_engine = os.environ.get('DATABASE_ENGINE', 'sqlite')
database_config = {
'sqlite': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
'NAME': ':memory:',
},
# 'mysql': {
# 'ENGINE': 'django.db.backends.mysql',
# 'NAME': 'admin_interface',
# 'USER': 'mysql',
# 'PASSWORD': 'mysql',
# 'HOST': '',
# 'PORT': '',
# },
'postgres': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'admin_interface',
'USER': 'postgres',
'PASSWORD': 'postgres',
'HOST': '',
'PORT': '',
}
}
DATABASES = {
'default': database_config.get(database_engine),
}
MEDIA_ROOT = os.path.join(BASE_DIR, 'admin_interface/public/media/')
MEDIA_URL = '/media/'
+92
View File
@@ -0,0 +1,92 @@
# -*- coding: utf-8 -*-
import django
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.test import override_settings, TestCase
from admin_interface.settings import check_installed_apps
class AdminInterfaceSettingsTestCase(TestCase):
DJANGO_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.messages',
'django.contrib.sessions',
]
def setUp(self):
pass
def tearDown(self):
pass
def __test_installed_apps(self):
dj_version = django.VERSION
installed_apps = settings.INSTALLED_APPS
if 'colorfield' not in installed_apps:
self.assertRaises(ImproperlyConfigured, check_installed_apps)
elif 'flat' not in installed_apps and dj_version < (1, 9):
self.assertRaises(ImproperlyConfigured, check_installed_apps)
elif 'flat' in installed_apps and dj_version >= (1, 9):
self.assertRaises(ImproperlyConfigured, check_installed_apps)
elif 'flat_responsive' not in installed_apps and dj_version < (2, 0):
self.assertRaises(ImproperlyConfigured, check_installed_apps)
elif 'flat_responsive' in installed_apps and dj_version >= (2, 0):
self.assertRaises(ImproperlyConfigured, check_installed_apps)
else:
check_installed_apps()
@override_settings(
INSTALLED_APPS = [
'admin_interface',
'colorfield',
'flat',
'flat_responsive',
] + DJANGO_APPS
)
def test_installed_apps_all(self):
self.__test_installed_apps()
@override_settings(
INSTALLED_APPS = [
'admin_interface',
# 'colorfield',
'flat',
'flat_responsive',
] + DJANGO_APPS
)
def test_installed_apps_no_colorfield(self):
self.__test_installed_apps()
@override_settings(
INSTALLED_APPS = [
'admin_interface',
'colorfield',
# 'flat',
'flat_responsive',
] + DJANGO_APPS
)
def test_installed_apps_no_flat(self):
self.__test_installed_apps()
@override_settings(
INSTALLED_APPS = [
'admin_interface',
'colorfield',
'flat',
# 'flat_responsive',
] + DJANGO_APPS
)
def test_installed_apps_no_flat_responsive(self):
self.__test_installed_apps()
+24 -24
View File
@@ -28,10 +28,10 @@ class AdminInterfaceTestCase(TestCase):
def __test_active_theme(self):
theme = Theme.get_active_theme()
print( theme )
print(theme)
self.assertTrue(theme != None)
self.assertTrue(theme.active)
self.assertEqual(Theme.objects.filter( active = True ).count(), 1);
self.assertEqual(Theme.objects.filter(active=True).count(), 1);
def test_default_theme_created_if_no_themes(self):
Theme.objects.all().delete()
@@ -50,47 +50,47 @@ class AdminInterfaceTestCase(TestCase):
def test_default_theme_activated_after_update_if_no_active_themes(self):
Theme.objects.all().delete()
Theme.objects.all().update( active = False )
Theme.objects.all().update(active=False)
self.__test_active_theme()
def test_default_theme_activated_after_update_if_multiple_active_themes(self):
Theme.objects.all().delete()
theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
Theme.objects.update( active = False )
Theme.objects.update( active = True )
theme_1 = Theme.objects.create(name='Custom 1', active=True)
theme_2 = Theme.objects.create(name='Custom 2', active=True)
theme_3 = Theme.objects.create(name='Custom 3', active=True)
Theme.objects.update(active=False)
Theme.objects.update(active=True)
self.__test_active_theme()
def test_default_theme_activated_on_active_theme_deleted(self):
Theme.objects.all().delete()
theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
Theme.objects.filter( pk = Theme.get_active_theme().pk ).delete()
theme_1 = Theme.objects.create(name='Custom 1', active=True)
theme_2 = Theme.objects.create(name='Custom 2', active=True)
theme_3 = Theme.objects.create(name='Custom 3', active=True)
Theme.objects.filter(pk=Theme.get_active_theme().pk).delete()
self.__test_active_theme()
def test_last_theme_activated_on_multiple_themes_created(self):
Theme.objects.all().delete()
theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
self.assertEqual( Theme.get_active_theme().pk, theme_3.pk )
theme_1 = Theme.objects.create(name='Custom 1', active=True)
theme_2 = Theme.objects.create(name='Custom 2', active=True)
theme_3 = Theme.objects.create(name='Custom 3', active=True)
self.assertEqual(Theme.get_active_theme().pk, theme_3.pk)
self.__test_active_theme()
def test_last_theme_activated_on_multiple_themes_activated(self):
Theme.objects.all().delete()
theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
theme_4 = Theme.objects.create( name = 'Custom 4', active = True )
theme_5 = Theme.objects.create( name = 'Custom 5', active = True )
themes = [ theme_1, theme_2, theme_3, theme_4, theme_5 ]
theme_1 = Theme.objects.create(name='Custom 1', active=True)
theme_2 = Theme.objects.create(name='Custom 2', active=True)
theme_3 = Theme.objects.create(name='Custom 3', active=True)
theme_4 = Theme.objects.create(name='Custom 4', active=True)
theme_5 = Theme.objects.create(name='Custom 5', active=True)
themes = [theme_1, theme_2, theme_3, theme_4, theme_5]
for i in range(5):
random.shuffle(themes)
for theme in themes:
theme.set_active()
self.assertEqual( Theme.get_active_theme().pk, theme.pk )
self.assertEqual(Theme.get_active_theme().pk, theme.pk)
self.__test_active_theme()
def test_templatetags_get_theme(self):
@@ -128,5 +128,5 @@ class AdminInterfaceTestCase(TestCase):
def test_repr(self):
theme = Theme.get_active_theme()
self.assertEqual( '{0}'.format(theme), 'Django' )
self.assertEqual('{0}'.format(theme), 'Django')
+20 -11
View File
@@ -1,21 +1,30 @@
[tox]
envlist =
py27-{17,18,19,110,111},
py34-{17,18,19,110,111,master},
py35-{18,19,110,111,master},
py36-{18,19,110,111,master},
py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres},
py34-{dj17,dj18,dj19,dj110,dj111,dj20}-{sqlite,postgres},
py35-{dj18,dj19,dj110,dj111,dj20,dj21}-{sqlite,postgres},
py36-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster}-{sqlite,postgres},
py37-{dj20,dj21,djmaster}-{sqlite,postgres},
[testenv]
passenv = CI TRAVIS TRAVIS_*
deps =
17: Django >= 1.7, < 1.8
18: Django >= 1.8, < 1.9
19: Django >= 1.9, < 1.10
110: Django >= 1.10, < 1.11
111: Django >= 1.11, < 1.12
master: https://github.com/django/django/archive/master.tar.gz
dj17: Django >= 1.7, < 1.8
dj18: Django >= 1.8, < 1.9
dj19: Django >= 1.9, < 1.10
dj110: Django >= 1.10, < 1.11
dj111: Django >= 1.11, < 1.12
dj20: Django >= 2.0, < 2.1
dj21: Django >= 2.1, < 2.2
djmaster: https://github.com/django/django/archive/master.tar.gz
# mysql: mysqlclient
postgres: psycopg2-binary
coverage
codecov
setenv =
sqlite: DATABASE_ENGINE=sqlite
# mysql: DATABASE_ENGINE=mysql
postgres: DATABASE_ENGINE=postgres
commands =
coverage run --append --source=admin_interface setup.py test
coverage report -m
codecov
codecov