Compare commits

..

55 Commits

Author SHA1 Message Date
Fabio Caccamo b7d9b969b4 Updated CHANGELOG and version. 2021-10-12 10:28:36 +02:00
Fabio Caccamo cacf0e0534 Fixed FileExtensionValidator TypeError on django < 1.11. 2021-10-12 10:28:19 +02:00
Fabio Caccamo e2239dcb99 Updated CHANGELOG and version. 2021-10-08 16:57:29 +02:00
Fabio Caccamo c769a449f2 Fixed FileExtensionValidator TypeError on django < 1.11. 2021-10-08 16:29:44 +02:00
Fabio Caccamo 3cff729a8a Updated CHANGELOG and version. 2021-09-24 09:08:05 +02:00
Fabio Caccamo c44db23b31 Fixed favicon fetching incompatible with django-storages S3. #128 2021-09-24 09:07:53 +02:00
Robert Durica 485f5400db Removed: Checking condition for colorfield package (#134) 2021-09-22 23:27:56 +02:00
Fabio Caccamo a2329fdae5 Updated CHANGELOG and version. 2021-09-16 15:48:16 +02:00
Fabio Caccamo a388ec234c Added logo_max_width and logo_max_height. #127 2021-09-16 15:47:14 +02:00
Fabio Caccamo a3b3f8922d Update CHANGELOG.md 2021-09-16 14:35:26 +02:00
Fabio Caccamo 6b6eed3aa0 Updated CHANGELOG and version. 2021-09-16 14:33:53 +02:00
Mason Neipp fd48e5ca97 Fixed 0020 migration for multiple dbs. #132 2021-09-04 14:45:49 +02:00
Fabio Caccamo fbc29246ff Improved header elements vertical alignment. 2021-05-06 23:34:49 +02:00
Fabio Caccamo 1569828c67 Updated README Installation section. [ci skip] 2021-05-02 10:39:56 +02:00
Fabio Caccamo bb73fafeff Fixed inlines vertical overlow. 2021-04-26 15:29:46 +02:00
Fabio Caccamo f76a41ff14 Fixed sticky pagination width and border-bottom. 2021-04-26 11:51:06 +02:00
Fabio Caccamo 4351751193 Updated CHANGELOG and version. 2021-04-26 10:18:58 +02:00
Fabio Caccamo 044ad518e0 Formatted migrations. 2021-04-26 10:16:03 +02:00
Fabio Caccamo 5b976adb1d Added missing 0021_file_extension_validator migration. #126 2021-04-26 10:15:24 +02:00
Fabio Caccamo 74732ec9a9 Added compat module. 2021-04-26 10:14:36 +02:00
Fabio Caccamo 5c85dc9cd4 Updated version and CHANGELOG. 2021-04-23 15:00:26 +02:00
Fabio Caccamo 66966501f8 Added FileExtensionValidator to logo and favicon fields. #112 2021-04-23 14:53:02 +02:00
Fabio Caccamo 30af685edf Improved selects min-width. 2021-04-21 11:30:30 +02:00
Fabio Caccamo 96d1568c13 Added min-width to selects. 2021-04-20 16:54:29 +02:00
Fabio Caccamo 7c04b35b44 Fixed related widget wrapper margin/padding with normal select. 2021-04-20 16:54:13 +02:00
Fabio Caccamo 004cd5fbcb Improved tabular inlines horizontal scroll. 2021-04-20 15:04:51 +02:00
Fabio Caccamo 8e37cdd218 Fixed related widget wrapper margin/padding in inlines. 2021-04-20 15:04:30 +02:00
Fabio Caccamo ba6807b7f3 Fixed changelist search and actions horizontal margins. 2021-04-16 12:33:21 +02:00
Fabio Caccamo 59a8b4d2d7 Removed invalid property. 2021-04-16 12:32:36 +02:00
Fabio Caccamo f72aac8848 Fixed changelist submit button margin left (with html minified). 2021-04-14 16:03:52 +02:00
Fabio Caccamo 41c6d5b7f1 Fixed header min-height. 2021-04-14 11:31:38 +02:00
Fabio Caccamo 554d8d27b7 Fixed models.W042 warning on django 3.2. 2021-04-14 11:18:58 +02:00
Fabio Caccamo c337c21a03 Added python 3.9 and django 3.2 to tox and travis. 2021-04-12 10:00:22 +02:00
Fabio Caccamo 0f9d502e4f Updated CHANGELOG and version. 2021-04-07 15:16:36 +02:00
Fabio Caccamo c961de3391 Overridden dark-mode css variables introduced in django 3.2. #124 2021-04-07 15:14:36 +02:00
Fabio Caccamo aec7ede184 Fixed delete confirmation styles selector prefix. 2021-04-07 15:13:23 +02:00
Natán d338e5914e Added custom style for the "Delete" and "Save" buttons from the delete confirmation page. (#123)
![Confirmation page](https://i.imgur.com/h4hflxu.png)
2021-04-07 15:09:20 +02:00
Fabio Caccamo 36971ad662 Fixed README links. [ci skip] 2021-03-30 18:17:29 +02:00
Fabio Caccamo d2c8885afa Updated CHANGELOG and version. 2021-03-30 18:13:11 +02:00
Fabio Caccamo e9b0694c0b Added supporting section to README. 2021-03-30 18:05:58 +02:00
Fabio Caccamo 14aa681e7d Removed unused funding options. 2021-03-30 18:02:02 +02:00
Fabio Caccamo c2e3545f46 Added responsive_rtl.css stylesheet. #98 2021-03-30 18:01:39 +02:00
Fabio Caccamo aed5afbfa7 Updated vazir-font version to 27.2.2. #98 2021-03-30 17:59:56 +02:00
Fabio Caccamo 9b7c6ee3fe Added css variables for css_module_background_selected_color and css_module_link_selected_color. #122 2021-03-30 17:57:44 +02:00
Henri Chain a8322872ab Added customizable colors for selected apps and models in dashboard. #122 2021-03-29 09:49:07 +02:00
Fabio Caccamo e5318b688b Updated CHANGELOG and version. 2021-03-26 19:17:05 +01:00
Fabio Caccamo 455259f3ef Fixed inline changelink style. 2021-03-26 19:14:39 +01:00
Fabio Caccamo 7d2d29a42c Made globally available presentRelatedObjectModal and presentRelatedObjectModalOnClickOn. 2021-03-26 19:14:22 +01:00
Henri Chain 5ed9fd75cc support show_change_link with related modal (#120) 2021-03-26 18:35:06 +01:00
Fabio Caccamo ca71642ecf Updated CHANGELOG and version. 2021-03-02 09:52:48 +01:00
Fabio Caccamo 4369288928 Fixed sticky submit and pagination z-index issue with related modal. 2021-03-02 09:52:36 +01:00
Fabio Caccamo f167bbf2c4 Updated README, CHANGELOG and version. 2021-03-01 23:32:26 +01:00
Fabio Caccamo 1b60af57e0 Fixed sticky submit and pagination z-index issue with sticky list_filter and django-json-widget. 2021-03-01 23:32:05 +01:00
Fabio Caccamo 947202f915 Updated version and CHANGELOG. 2021-02-08 11:21:37 +01:00
Fabio Caccamo 7eb6371104 Fixed sticky submit and pagination width when admin.site.enable_nav_sidebar = False. #113 2021-02-08 11:21:04 +01:00
32 changed files with 533 additions and 123 deletions
-4
View File
@@ -1,6 +1,2 @@
github: [fabiocaccamo] github: [fabiocaccamo]
patreon: fabiocaccamo
ko_fi: fabiocaccamo
liberapay: fabiocaccamo
issuehunt: fabiocaccamo
custom: ['https://www.paypal.me/fabiocaccamo'] custom: ['https://www.paypal.me/fabiocaccamo']
+34 -18
View File
@@ -76,6 +76,10 @@ jobs:
env: TOX_ENV=py36-dj31-sqlite env: TOX_ENV=py36-dj31-sqlite
- python: "3.6" - python: "3.6"
env: TOX_ENV=py36-dj31-postgres env: TOX_ENV=py36-dj31-postgres
- python: "3.6"
env: TOX_ENV=py36-dj32-sqlite
- python: "3.6"
env: TOX_ENV=py36-dj32-postgres
- python: "3.6" - python: "3.6"
env: TOX_ENV=py36-djmaster-sqlite env: TOX_ENV=py36-djmaster-sqlite
- python: "3.6" - python: "3.6"
@@ -100,6 +104,10 @@ jobs:
env: TOX_ENV=py37-dj31-sqlite env: TOX_ENV=py37-dj31-sqlite
- python: "3.7" - python: "3.7"
env: TOX_ENV=py37-dj31-postgres env: TOX_ENV=py37-dj31-postgres
- python: "3.7"
env: TOX_ENV=py37-dj32-sqlite
- python: "3.7"
env: TOX_ENV=py37-dj32-postgres
- python: "3.7" - python: "3.7"
env: TOX_ENV=py37-djmaster-sqlite env: TOX_ENV=py37-djmaster-sqlite
- python: "3.7" - python: "3.7"
@@ -116,26 +124,34 @@ jobs:
env: TOX_ENV=py38-dj31-sqlite env: TOX_ENV=py38-dj31-sqlite
- python: "3.8" - python: "3.8"
env: TOX_ENV=py38-dj31-postgres env: TOX_ENV=py38-dj31-postgres
- python: "3.8"
env: TOX_ENV=py38-dj32-sqlite
- python: "3.8"
env: TOX_ENV=py38-dj32-postgres
- python: "3.8" - python: "3.8"
env: TOX_ENV=py38-djmaster-sqlite env: TOX_ENV=py38-djmaster-sqlite
- python: "3.8" - python: "3.8"
env: TOX_ENV=py38-djmaster-postgres env: TOX_ENV=py38-djmaster-postgres
# - python: "3.9" - python: "3.9"
# env: TOX_ENV=py39-dj22-sqlite env: TOX_ENV=py39-dj22-sqlite
# - python: "3.9" - python: "3.9"
# env: TOX_ENV=py39-dj22-postgres env: TOX_ENV=py39-dj22-postgres
# - python: "3.9" - python: "3.9"
# env: TOX_ENV=py39-dj30-sqlite env: TOX_ENV=py39-dj30-sqlite
# - python: "3.9" - python: "3.9"
# env: TOX_ENV=py39-dj30-postgres env: TOX_ENV=py39-dj30-postgres
# - python: "3.9" - python: "3.9"
# env: TOX_ENV=py39-dj31-sqlite env: TOX_ENV=py39-dj31-sqlite
# - python: "3.9" - python: "3.9"
# env: TOX_ENV=py39-dj31-postgres env: TOX_ENV=py39-dj31-postgres
# - python: "3.9" - python: "3.9"
# env: TOX_ENV=py39-djmaster-sqlite env: TOX_ENV=py39-dj32-sqlite
# - python: "3.9" - python: "3.9"
# env: TOX_ENV=py39-djmaster-postgres env: TOX_ENV=py39-dj32-postgres
- python: "3.9"
env: TOX_ENV=py39-djmaster-sqlite
- python: "3.9"
env: TOX_ENV=py39-djmaster-postgres
allow_failures: allow_failures:
- env: TOX_ENV=py36-djmaster-sqlite - env: TOX_ENV=py36-djmaster-sqlite
- env: TOX_ENV=py36-djmaster-postgres - env: TOX_ENV=py36-djmaster-postgres
@@ -143,8 +159,8 @@ jobs:
- env: TOX_ENV=py37-djmaster-postgres - env: TOX_ENV=py37-djmaster-postgres
- env: TOX_ENV=py38-djmaster-sqlite - env: TOX_ENV=py38-djmaster-sqlite
- env: TOX_ENV=py38-djmaster-postgres - env: TOX_ENV=py38-djmaster-postgres
# - env: TOX_ENV=py39-djmaster-sqlite - env: TOX_ENV=py39-djmaster-sqlite
# - env: TOX_ENV=py39-djmaster-postgres - env: TOX_ENV=py39-djmaster-postgres
install: install:
- pip install tox - pip install tox
services: services:
+57
View File
@@ -4,6 +4,63 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [0.17.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.17.3) - 2021-10-12
- Fixed `FileExtensionValidator` `TypeError` on django < 1.11.
## [0.17.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.17.2) - 2021-10-08
- Fixed `FileExtensionValidator` `TypeError` on django < 1.11.
## [0.17.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.17.1) - 2021-09-24
- Fixed `TemplateDoesNotExist` error on `django==4.0.a1` removing checking condition for `colorfield` package. #134
- Fixed favicon fetching incompatible with `django-storages` `S3`. #128
## [0.17.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.17.0) - 2021-09-16
- Added `logo_max_width` and `logo_max_height`. #127
## [0.16.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.16.4) - 2021-09-04
- Fixed `0020_module_selected_colors` migration for multiple dbs. #132
- Fixed sticky pagination `width` and `border-bottom`.
- Fixed inlines vertical overlow.
- Improved header elements vertical alignment.
## [0.16.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.16.3) - 2021-04-26
- Added `compat` module.
- Added missing `0021_file_extension_validator` migration. #126
- Formatted migrations.
## [0.16.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.16.2) - 2021-04-23
- Added `python 3.9` and `django 3.2` to CI.
- Added `FileExtensionValidator` to `logo` and `favicon` fields. #112
- Fixed `models.W042` warning on `django 3.2`.
- Fixed header `min-height`.
- Fixed selects `min-width`.
- Fixed changelist search, actions and submit button horizontal margins.
- Fixed related widget wrapper margin/padding with normal select and in inlines.
- Fixed tabular inlines horizontal scroll.
## [0.16.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.16.1) - 2021-04-07
- Fixed style of "Delete" and "Save" buttons in the delete confirmation page. #123
- Overridden dark-mode css variables introduced in `django 3.2`. #124
## [0.16.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.16.0) - 2021-03-30
- Added customizable colors for selected apps and models in dashboard. #122
- Added `responsive_rtl.css` stylesheet. #98
- Updated `vazir-font` version to `27.2.2`. #98
## [0.15.6](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.6) - 2021-03-26
- Fixed `show_change_link` related modal support. #120
- Fixed inline changelink style.
- Made globally available `presentRelatedObjectModal` and `presentRelatedObjectModalOnClickOn` js functions.
## [0.15.5](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.5) - 2021-03-02
- Fixed sticky submit and pagination `z-index` issue with related modal.
## [0.15.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.4) - 2021-03-01
- Fixed sticky submit and pagination `z-index` issue with sticky `list_filter` and `django-json-widget`.
## [0.15.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.3) - 2021-02-08
- Fixed sticky submit and pagination width when `admin.site.enable_nav_sidebar = False`. #113
## [0.15.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.2) - 2021-02-03 ## [0.15.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.2) - 2021-02-03
- Fixed body classes template rendering. - Fixed body classes template rendering.
- Improved sticky submit and pagination backward compatibility. - Improved sticky submit and pagination backward compatibility.
+24 -5
View File
@@ -22,10 +22,12 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
- Beautiful default **django-theme** - Beautiful default **django-theme**
- Themes management and customization *(you can **customize admin title, logo and colors**)* - Themes management and customization *(you can **customize admin title, logo and colors**)*
- Responsive - Responsive
- List filter dropdown *(optional)* - Related modal *(instead of the old popup window)*
- `NEW` **Related modal** *(instead of the old popup window, optional)* - Environment name/marker
- `NEW` **Environment name/marker** - Language chooser
- `NEW` **Language chooser** - List filter dropdown
- `NEW` **List filter sticky**
- `NEW` **Form controls sticky** *(pagination and save/delete buttons)*
- Compatibility / Style optimizations for: - Compatibility / Style optimizations for:
- `django-ckeditor` - `django-ckeditor`
- `django-dynamic-raw-id` - `django-dynamic-raw-id`
@@ -49,7 +51,9 @@ INSTALLED_APPS = (
#... #...
) )
X_FRAME_OPTIONS='SAMEORIGIN' # only if django version >= 3.0 # only if django version >= 3.0
X_FRAME_OPTIONS = 'SAMEORIGIN'
SILENCED_SYSTEM_CHECKS = ['security.W019']
``` ```
- Run ``python manage.py migrate`` - Run ``python manage.py migrate``
- Run ``python manage.py collectstatic`` - Run ``python manage.py collectstatic``
@@ -99,8 +103,10 @@ You can add **theme support to existing third-party libraries** using the follow
- `--admin-interface-header-link-color` - `--admin-interface-header-link-color`
- `--admin-interface-header-link_hover-color` - `--admin-interface-header-link_hover-color`
- `--admin-interface-module-background-color` - `--admin-interface-module-background-color`
- `--admin-interface-module-background-selected-color`
- `--admin-interface-module-text-color` - `--admin-interface-module-text-color`
- `--admin-interface-module-link-color` - `--admin-interface-module-link-color`
- `--admin-interface-module-link-selected-color`
- `--admin-interface-module-link-hover-color` - `--admin-interface-module-link-hover-color`
- `--admin-interface-generic-link-color` - `--admin-interface-generic-link-color`
- `--admin-interface-generic-link-hover-color` - `--admin-interface-generic-link-hover-color`
@@ -159,6 +165,19 @@ Released under [MIT License](LICENSE.txt).
--- ---
## Supporting
I would like to spend more time on this project, especially to improve it and adding new features.
As everyone knows open-source projects takes up a lot of time that is unpaid. :money_with_wings:
If you are using this package in commercial project(s), please consider the idea to become a sponsor or donating once:
- [GitHub Sponsor](https://github.com/sponsors/fabiocaccamo)
- [PayPal](https://www.paypal.me/fabiocaccamo)
- BTC: bc1q2t0pv8z3udpyuvfnx5kskhqdad4dcvtfuzmvjw
- ETH: 0x8B55Fb7798b5A9F797A4455C00821B6e53daca74
## See also ## See also
- [`django-colorfield`](https://github.com/fabiocaccamo/django-colorfield) - simple color field for models with a nice color-picker in the admin. 🎨 - [`django-colorfield`](https://github.com/fabiocaccamo/django-colorfield) - simple color field for models with a nice color-picker in the admin. 🎨
+5 -5
View File
@@ -1,13 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from admin_interface.compat import gettext_lazy as _
from admin_interface.models import Theme from admin_interface.models import Theme
import django
from django.contrib import admin from django.contrib import admin
if django.VERSION < (2, 0):
from django.utils.translation import ugettext_lazy as _
else:
from django.utils.translation import gettext_lazy as _
class ThemeAdmin(admin.ModelAdmin): class ThemeAdmin(admin.ModelAdmin):
@@ -42,6 +38,8 @@ class ThemeAdmin(admin.ModelAdmin):
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'logo', 'logo',
'logo_max_width',
'logo_max_height',
'logo_color', 'logo_color',
'logo_visible', 'logo_visible',
) )
@@ -71,8 +69,10 @@ class ThemeAdmin(admin.ModelAdmin):
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
'css_module_background_color', 'css_module_background_color',
'css_module_background_selected_color',
'css_module_text_color', 'css_module_text_color',
'css_module_link_color', 'css_module_link_color',
'css_module_link_selected_color',
'css_module_link_hover_color', 'css_module_link_hover_color',
'css_module_rounded_corners', 'css_module_rounded_corners',
) )
+3 -5
View File
@@ -1,18 +1,16 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import django from admin_interface.compat import gettext_lazy as _
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
if django.VERSION < (2, 0):
from django.utils.translation import ugettext_lazy as _
else:
from django.utils.translation import gettext_lazy as _
class AdminInterfaceConfig(AppConfig): class AdminInterfaceConfig(AppConfig):
name = 'admin_interface' name = 'admin_interface'
verbose_name = _('Admin Interface') verbose_name = _('Admin Interface')
default_auto_field = 'django.db.models.AutoField'
def ready(self): def ready(self):
+18
View File
@@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
import django
if django.VERSION < (2, 0):
from django.utils.encoding import force_text as force_str
from django.utils.translation import ugettext_lazy as gettext_lazy
else:
from django.utils.encoding import force_str
from django.utils.translation import gettext_lazy
if django.VERSION >= (1, 11):
from django.core.validators import FileExtensionValidator
else:
def FileExtensionValidator(*args, **kwargs):
def noop(*args, **kwargs):
pass
return noop
@@ -15,11 +15,21 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='env', name='env',
field=models.CharField(choices=[('development', 'Development'), ('testing', 'Testing'), ('staging', 'Staging'), ('production', 'Production')], default='development', max_length=50, verbose_name='enviroment'), field=models.CharField(
choices=[
('development', 'Development'),
('testing', 'Testing'),
('staging', 'Staging'),
('production', 'Production')],
default='development',
max_length=50,
verbose_name='enviroment'),
), ),
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='env_visible', name='env_visible',
field=models.BooleanField(default=True, verbose_name='visible'), field=models.BooleanField(
default=True,
verbose_name='visible'),
), ),
] ]
@@ -15,31 +15,55 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='active', name='active',
field=models.BooleanField(default=True, verbose_name='active'), field=models.BooleanField(
default=True,
verbose_name='active'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css', name='css',
field=models.TextField(blank=True, verbose_name='text color'), field=models.TextField(
blank=True,
verbose_name='text color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='env', name='env',
field=models.CharField(choices=[('development', 'Development'), ('testing', 'Testing'), ('staging', 'Staging'), ('production', 'Production')], default='development', max_length=50, verbose_name='environment'), field=models.CharField(
choices=[
('development', 'Development'),
('testing', 'Testing'),
('staging', 'Staging'),
('production', 'Production')
],
default='development',
max_length=50,
verbose_name='environment'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='logo', 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'), 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( migrations.AlterField(
model_name='theme', model_name='theme',
name='name', name='name',
field=models.CharField(default='Django', max_length=50, verbose_name='name'), field=models.CharField(
default='Django',
max_length=50,
verbose_name='name'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='title', name='title',
field=models.CharField(blank=True, default='Django administration', max_length=50, verbose_name='title'), field=models.CharField(
blank=True,
default='Django administration',
max_length=50,
verbose_name='title'),
), ),
] ]
@@ -17,11 +17,21 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='logo_color', name='logo_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='color'), field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='title_color', name='title_color',
field=colorfield.fields.ColorField(blank=True, default='#F5DD5D', help_text='#F5DD5D', max_length=10, verbose_name='color'), field=colorfield.fields.ColorField(
blank=True,
default='#F5DD5D',
help_text='#F5DD5D',
max_length=10,
verbose_name='color'),
), ),
] ]
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='related_modal_close_button_visible', name='related_modal_close_button_visible',
field=models.BooleanField(default=True, verbose_name='close button visible'), field=models.BooleanField(
default=True,
verbose_name='close button visible'),
), ),
] ]
@@ -15,6 +15,10 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='name', name='name',
field=models.CharField(default='Django', max_length=50, unique=True, verbose_name='name'), field=models.CharField(
default='Django',
max_length=50,
unique=True,
verbose_name='name'),
), ),
] ]
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='language_chooser_active', name='language_chooser_active',
field=models.BooleanField(default=True, verbose_name='active'), field=models.BooleanField(
default=True,
verbose_name='active'),
), ),
] ]
@@ -15,6 +15,13 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='language_chooser_display', name='language_chooser_display',
field=models.CharField(choices=[('code', 'code'), ('name', 'name')], default='code', max_length=10, verbose_name='display'), field=models.CharField(
choices=[
('code', 'code'),
('name', 'name')
],
default='code',
max_length=10,
verbose_name='display'),
), ),
] ]
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='list_filter_dropdown', name='list_filter_dropdown',
field=models.BooleanField(default=True, verbose_name='use dropdown'), field=models.BooleanField(
default=True,
verbose_name='use dropdown'),
), ),
] ]
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='list_filter_sticky', name='list_filter_sticky',
field=models.BooleanField(default=True, verbose_name='sticky position'), field=models.BooleanField(
default=True,
verbose_name='sticky position'),
), ),
] ]
@@ -1,4 +1,6 @@
# Generated by Django 3.1.5 on 2021-01-29 20:29 # -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
@@ -13,11 +15,15 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='form_pagination_sticky', name='form_pagination_sticky',
field=models.BooleanField(default=False, verbose_name='sticky pagination'), field=models.BooleanField(
default=False,
verbose_name='sticky pagination'),
), ),
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='form_submit_sticky', name='form_submit_sticky',
field=models.BooleanField(default=False, verbose_name='sticky submit'), field=models.BooleanField(
default=False,
verbose_name='sticky submit'),
), ),
] ]
@@ -0,0 +1,46 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
from django.db.models import F
import colorfield.fields
def default_link_selected(apps, schema_editor):
Theme = apps.get_model("admin_interface", "Theme")
db_alias = schema_editor.connection.alias
Theme.objects.using(db_alias).update(
css_module_link_selected_color=F('css_module_link_color'))
class Migration(migrations.Migration):
dependencies = [
('admin_interface', '0019_add_form_sticky'),
]
operations = [
migrations.AddField(
model_name='theme',
name='css_module_background_selected_color',
field=colorfield.fields.ColorField(
blank=True,
default='#FFFFCC',
help_text='#FFFFCC',
max_length=10,
verbose_name='background selected color'),
),
migrations.AddField(
model_name='theme',
name='css_module_link_selected_color',
field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='link selected color'),
),
migrations.RunPython(default_link_selected),
]
@@ -0,0 +1,45 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from admin_interface.compat import FileExtensionValidator
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('admin_interface', '0020_module_selected_colors'),
]
operations = [
migrations.AlterField(
model_name='theme',
name='favicon',
field=models.FileField(
blank=True,
help_text='(.ico|.png|.gif - 16x16|32x32 px)',
upload_to='admin-interface/favicon/',
validators=[
FileExtensionValidator(allowed_extensions=[
'gif', 'ico', 'jpg', 'jpeg', 'png', 'svg'
])
],
verbose_name='favicon'),
),
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/',
validators=[
FileExtensionValidator(allowed_extensions=[
'gif', 'jpg', 'jpeg', 'png', 'svg'
])
],
verbose_name='logo'),
),
]
@@ -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', '0021_file_extension_validator'),
]
operations = [
migrations.AddField(
model_name='theme',
name='logo_max_height',
field=models.PositiveSmallIntegerField(blank=True, default=100, verbose_name='max height'),
),
migrations.AddField(
model_name='theme',
name='logo_max_width',
field=models.PositiveSmallIntegerField(blank=True, default=400, verbose_name='max width'),
),
]
+25 -7
View File
@@ -3,18 +3,12 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from admin_interface.cache import del_cached_active_theme from admin_interface.cache import del_cached_active_theme
from admin_interface.compat import FileExtensionValidator, force_str, gettext_lazy as _
from colorfield.fields import ColorField from colorfield.fields import ColorField
import django
from django.db import models from django.db import models
from django.db.models.signals import post_delete, post_save, pre_save from django.db.models.signals import post_delete, post_save, pre_save
if django.VERSION < (2, 0):
from django.utils.encoding import force_text as force_str
from django.utils.translation import ugettext_lazy as _
else:
from django.utils.encoding import force_str
from django.utils.translation import gettext_lazy as _
from six import python_2_unicode_compatible from six import python_2_unicode_compatible
@@ -99,6 +93,8 @@ class Theme(models.Model):
logo = models.FileField( logo = models.FileField(
upload_to='admin-interface/logo/', upload_to='admin-interface/logo/',
blank=True, blank=True,
validators=[FileExtensionValidator(
allowed_extensions=['gif', 'jpg', 'jpeg', 'png', 'svg'])],
help_text=_('Leave blank to use the default Django logo'), help_text=_('Leave blank to use the default Django logo'),
verbose_name=_('logo')) verbose_name=_('logo'))
logo_color = ColorField( logo_color = ColorField(
@@ -107,6 +103,14 @@ class Theme(models.Model):
help_text='#FFFFFF', help_text='#FFFFFF',
max_length=10, max_length=10,
verbose_name=_('color')) verbose_name=_('color'))
logo_max_width = models.PositiveSmallIntegerField(
blank=True,
default=400,
verbose_name=_('max width'))
logo_max_height = models.PositiveSmallIntegerField(
blank=True,
default=100,
verbose_name=_('max height'))
logo_visible = models.BooleanField( logo_visible = models.BooleanField(
default=True, default=True,
verbose_name=_('visible')) verbose_name=_('visible'))
@@ -114,6 +118,8 @@ class Theme(models.Model):
favicon = models.FileField( favicon = models.FileField(
upload_to='admin-interface/favicon/', upload_to='admin-interface/favicon/',
blank=True, blank=True,
validators=[FileExtensionValidator(
allowed_extensions=['gif', 'ico', 'jpg', 'jpeg', 'png', 'svg'])],
help_text=_('(.ico|.png|.gif - 16x16|32x32 px)'), help_text=_('(.ico|.png|.gif - 16x16|32x32 px)'),
verbose_name=_('favicon')) verbose_name=_('favicon'))
@@ -178,6 +184,12 @@ class Theme(models.Model):
help_text='#44B78B', help_text='#44B78B',
max_length=10, max_length=10,
verbose_name=_('background color')) verbose_name=_('background color'))
css_module_background_selected_color = ColorField(
blank=True,
default='#FFFFCC',
help_text='#FFFFCC',
max_length=10,
verbose_name=_('background selected color'))
css_module_text_color = ColorField( css_module_text_color = ColorField(
blank=True, blank=True,
default='#FFFFFF', default='#FFFFFF',
@@ -190,6 +202,12 @@ class Theme(models.Model):
help_text='#FFFFFF', help_text='#FFFFFF',
max_length=10, max_length=10,
verbose_name=_('link color')) verbose_name=_('link color'))
css_module_link_selected_color = ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name=_('link selected color'))
css_module_link_hover_color = ColorField( css_module_link_hover_color = ColorField(
blank=True, blank=True,
default='#C9F0DD', default='#C9F0DD',
-1
View File
@@ -23,6 +23,5 @@ def check_installed_app(app, app_dj_version_limit):
def check_installed_apps(): def check_installed_apps():
check_installed_app('colorfield', (4, 0))
check_installed_app('flat', (1, 9)) check_installed_app('flat', (1, 9))
check_installed_app('flat_responsive', (2, 0)) check_installed_app('flat_responsive', (2, 0))
@@ -130,6 +130,10 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
el.click(data, presentRelatedObjectModal); el.click(data, presentRelatedObjectModal);
} }
// assign functions to global variables
window.presentRelatedObjectModal = presentRelatedObjectModal;
window.presentRelatedObjectModalOnClickOn = presentRelatedObjectModalOnClickOn;
// django 1.7 compatibility // django 1.7 compatibility
// $('a.add-another').removeAttr('onclick').click({ lookup:false }, presentRelatedObjectModal); // $('a.add-another').removeAttr('onclick').click({ lookup:false }, presentRelatedObjectModal);
presentRelatedObjectModalOnClickOn('a.add-another'); presentRelatedObjectModalOnClickOn('a.add-another');
@@ -145,6 +149,9 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
// django-dynamic-raw-id support - #61 // django-dynamic-raw-id support - #61
// https://github.com/lincolnloop/django-dynamic-raw-id // https://github.com/lincolnloop/django-dynamic-raw-id
presentRelatedObjectModalOnClickOn('a.dynamic_raw_id-related-lookup', true); presentRelatedObjectModalOnClickOn('a.dynamic_raw_id-related-lookup', true);
// show_change_link=True support
presentRelatedObjectModalOnClickOn('a.inlinechangelink');
}); });
})(django.jQuery); })(django.jQuery);
@@ -37,7 +37,7 @@ https://github.com/fabiocaccamo/django-admin-interface
</style> </style>
{% if current_lang == 'fa' %} {% if current_lang == 'fa' %}
<link href="https://cdn.jsdelivr.net/gh/rastikerdar/vazir-font@v26.0.2/dist/font-face.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/rastikerdar/vazir-font@v27.2.2/dist/font-face.css" />
{% endif %} {% endif %}
{% endblock %} {% endblock %}
@@ -48,7 +48,8 @@ https://github.com/fabiocaccamo/django-admin-interface
{% get_admin_interface_version as version %} {% get_admin_interface_version as version %}
{# https://github.com/elky/django-flat-responsive#important-note #} {# https://github.com/elky/django-flat-responsive#important-note #}
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"> <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" href="{% static 'admin/css/responsive.css' %}?v={{ version }}"> <link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive.css' %}?v={{ version }}">
<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive_rtl.css' %}?v={{ version }}" />
{% include "admin_interface/favicon.html" %} {% include "admin_interface/favicon.html" %}
{% include "admin_interface/related-modal.html" %} {% include "admin_interface/related-modal.html" %}
{% endblock %} {% endblock %}
@@ -23,6 +23,7 @@
} }
.admin-interface.login #header { .admin-interface.login #header {
min-height: auto;
padding: 10px 30px; padding: 10px 30px;
line-height: 30px; line-height: 30px;
align-items: flex-start; align-items: flex-start;
@@ -40,7 +41,6 @@
.admin-interface.login #header #branding h1 img.logo+span { .admin-interface.login #header #branding h1 img.logo+span {
display: block; display: block;
margin-bottom: 5px;
} }
.admin-interface.login #login-form { .admin-interface.login #login-form {
@@ -72,22 +72,21 @@
/* end login fix*/ /* end login fix*/
.admin-interface #header { .admin-interface #header {
height:auto; height: auto;
min-height:40px; min-height: 55px;
box-sizing: border-box;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: start; align-items: center;
} }
@media (max-width:1024px) { @media (max-width:1024px) {
.admin-interface #header { .admin-interface #header {
align-items: flex-start; align-items: center;
} }
} }
.admin-interface #branding h1 img.logo { .admin-interface #branding h1 img.logo {
max-width: 400px;
max-height:100px;
margin-top:10px; margin-top:10px;
margin-bottom:10px; margin-bottom:10px;
margin-right:15px; margin-right:15px;
@@ -102,13 +101,28 @@
.admin-interface #branding h1 span { .admin-interface #branding h1 span {
display: inline-block; display: inline-block;
margin-bottom: 5px;
} }
.admin-interface #branding h1 img.logo+span { .admin-interface #branding h1 img.logo+span {
white-space:nowrap; white-space:nowrap;
} }
.admin-interface #user-tools {
margin-top: 10px;
margin-bottom: 10px;
white-space: nowrap;
align-self: flex-start;
}
.admin-interface #user-tools br {
display: none;
}
@media (max-width: 768px) {
.admin-interface #user-tools br {
display: block;
}
}
.admin-interface fieldset.collapse { .admin-interface fieldset.collapse {
border: 1px solid transparent; border: 1px solid transparent;
} }
@@ -122,6 +136,13 @@
padding: 0 1px; padding: 0 1px;
} }
@media (min-width: 1024px) {
.admin-interface #changelist .actions .button,
.admin-interface #changelist .actions .action-counter {
margin-left: 8px;
}
}
.admin-interface #changelist .paginator { .admin-interface #changelist .paginator {
margin-top:-1px; /* merge 2 borders into 1 */ margin-top:-1px; /* merge 2 borders into 1 */
line-height:42px; line-height:42px;
@@ -164,6 +185,12 @@ body.admin-interface .paginator a.showall:visited {
margin-left: 5px; margin-left: 5px;
} }
.admin-interface .inline-group .inlinechangelink {
background-size: contain;
padding-left: 15px;
margin-left: 10px;
}
.admin-interface .file-thumbnail > a { .admin-interface .file-thumbnail > a {
display: inline-block; display: inline-block;
} }
@@ -178,7 +205,6 @@ body.admin-interface .paginator a.showall:visited {
.admin-interface form .form-row p.file-upload .clearable-file-input { .admin-interface form .form-row p.file-upload .clearable-file-input {
display:inline-block; display:inline-block;
margin-left:
} }
.admin-interface form .form-row p.file-upload .clearable-file-input label { .admin-interface form .form-row p.file-upload .clearable-file-input label {
@@ -297,16 +323,13 @@ body.admin-interface .paginator a.showall:visited {
} }
/* end fix */ /* end fix */
/* begin fix issue #10 - Related widget broken in long tabular inline */
.admin-interface .inline-group .tabular .related-widget-wrapper {
white-space:nowrap;
}
/* end fix */
/* begin fix tabular inlines horizontal scroll */ /* begin fix tabular inlines horizontal scroll */
.admin-interface .inline-related.tabular {
overflow-x: scroll;
overflow-y: hidden;
}
.admin-interface .inline-related.tabular fieldset.module { .admin-interface .inline-related.tabular fieldset.module {
display: contents; display: contents;
overflow-x: scroll;
width: 100%; width: 100%;
white-space: nowrap; white-space: nowrap;
position: relative; position: relative;
@@ -452,17 +475,31 @@ body.admin-interface .paginator a.showall:visited {
} }
/* fixed related widget and select2 */ /* fixed related widget and select2 */
.admin-interface .aligned .form-row .related-widget-wrapper { /* begin fix issue #10 - Related widget broken in long tabular inline */
.admin-interface .related-widget-wrapper {
white-space: nowrap; white-space: nowrap;
} }
/* end fix */
.admin-interface .aligned .form-row .related-widget-wrapper .select2-container ~ .related-widget-wrapper-link { .admin-interface .related-widget-wrapper select + .related-widget-wrapper-link,
margin-left: 0; .admin-interface .related-widget-wrapper .select2-container + .related-widget-wrapper-link {
padding: 4px 8px 6px 8px; margin-left: 12px !important;
} }
.admin-interface .aligned .form-row .related-widget-wrapper .select2-container + .related-widget-wrapper-link { @media (min-width: 768px) {
margin-left: 5px !important; .admin-interface.change-form select {
min-width: 150px;
}
}
@media (min-width: 1024px) {
.admin-interface.change-form select {
min-width: 200px;
}
}
.admin-interface.change-form .inline-related.tabular select {
min-width: auto !important;
} }
/* fixed time widget header border radius */ /* fixed time widget header border radius */
@@ -476,6 +513,18 @@ body.admin-interface .paginator a.showall:visited {
padding: 2px 5px 3px 5px; padding: 2px 5px 3px 5px;
} }
@media (min-width: 1024px) {
.admin-interface #changelist #changelist-search #searchbar,
.admin-interface #changelist #changelist-search input[type="submit"],
.admin-interface #changelist #changelist-search .quiet {
margin-left: 8px;
}
.admin-interface #changelist #changelist-search label img {
vertical-align: text-top;
margin-right: 0px;
}
}
@media (max-width: 1024px) { @media (max-width: 1024px) {
.admin-interface #changelist #toolbar { .admin-interface #changelist #toolbar {
border-top: 1px solid #eee; border-top: 1px solid #eee;
File diff suppressed because one or more lines are too long
@@ -9,7 +9,7 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
right: 0; right: 0;
z-index: 1; z-index: 40;
box-sizing: border-box; box-sizing: border-box;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
@@ -41,8 +41,8 @@
} }
@media (min-width:1280px) { @media (min-width:1280px) {
.admin-interface.sticky-pagination.change-list:not(.popup) .shifted .paginator { .admin-interface.sticky-pagination.change-list:not(.popup) #main.shifted > #nav-sidebar + .content .paginator {
width: calc(100% - 359px); width: calc(100% - 360px);
} }
} }
@@ -58,7 +58,7 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
right: 0; right: 0;
z-index: 1; z-index: 40;
box-sizing: border-box; box-sizing: border-box;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
@@ -66,7 +66,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
border-radius: 0; border-radius: 0;
border-top: 1px solid #EEEEEE; border-top: 1px solid #EEEEEE;
border-bottom: none; border-bottom: none !important;
margin: 0; margin: 0;
} }
@@ -89,7 +89,7 @@
} }
@media (min-width:1280px) { @media (min-width:1280px) {
.admin-interface.sticky-submit.change-form:not(.popup) .shifted .submit-row:last-of-type { .admin-interface.sticky-submit.change-form:not(.popup) #main.shifted > #nav-sidebar + .content .submit-row:last-of-type {
width: calc(100% - 359px); width: calc(100% - 359px);
} }
} }
@@ -23,7 +23,7 @@ https://github.com/jmrivas86/django-json-widget
.admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected, .admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected,
.admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected:focus, .admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected:focus,
.admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected:hover { .admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected:hover {
background-color: #FFFFCC; background-color: {{ theme.css_module_background_selected_color }};
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
} }
@@ -1,7 +1,7 @@
{% load static %} {% load static %}
{% if theme.favicon %} {% if theme.favicon %}
<link rel="icon" href="{{ theme.favicon.url }}?v={{ version }}"> <link rel="icon" href="{{ theme.favicon.url }}">
{% if theme.env_visible_in_favicon %} {% if theme.env_visible_in_favicon %}
<script type="text/javascript" src="{% static 'admin_interface/favico/favico-0.3.10-patched.min.js' %}?v={{ version }}"></script> <script type="text/javascript" src="{% static 'admin_interface/favico/favico-0.3.10-patched.min.js' %}?v={{ version }}"></script>
<script type="text/javascript"> <script type="text/javascript">
+1 -1
View File
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
__version__ = '0.15.2' __version__ = '0.17.3'
+1
View File
@@ -55,6 +55,7 @@ setup(
'Framework :: Django :: 2.2', 'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0', 'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1', 'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',
'Natural Language :: English', 'Natural Language :: English',
+5 -4
View File
@@ -2,10 +2,10 @@
envlist = envlist =
py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres}, py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres},
py35-{dj18,dj19,dj110,dj111,dj20,dj21,dj22}-{sqlite,postgres}, py35-{dj18,dj19,dj110,dj111,dj20,dj21,dj22}-{sqlite,postgres},
py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres}, py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
py37-{dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres}, py37-{dj20,dj21,dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
py38-{dj22,dj30,dj31,djmaster}-{sqlite,postgres}, py38-{dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
py39-{dj22,dj30,dj31,djmaster}-{sqlite,postgres}, py39-{dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
[testenv] [testenv]
passenv = CI TRAVIS TRAVIS_* passenv = CI TRAVIS TRAVIS_*
deps = deps =
@@ -19,6 +19,7 @@ deps =
dj22: Django == 2.2.* dj22: Django == 2.2.*
dj30: Django == 3.0.* dj30: Django == 3.0.*
dj31: Django == 3.1.* dj31: Django == 3.1.*
dj32: Django == 3.2.*
djmaster: https://github.com/django/django/archive/master.tar.gz djmaster: https://github.com/django/django/archive/master.tar.gz
# mysql: mysqlclient # mysql: mysqlclient
postgres: psycopg2-binary postgres: psycopg2-binary