Compare commits
64 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5c85dc9cd4 | |||
| 66966501f8 | |||
| 30af685edf | |||
| 96d1568c13 | |||
| 7c04b35b44 | |||
| 004cd5fbcb | |||
| 8e37cdd218 | |||
| ba6807b7f3 | |||
| 59a8b4d2d7 | |||
| f72aac8848 | |||
| 41c6d5b7f1 | |||
| 554d8d27b7 | |||
| c337c21a03 | |||
| 0f9d502e4f | |||
| c961de3391 | |||
| aec7ede184 | |||
| d338e5914e | |||
| 36971ad662 | |||
| d2c8885afa | |||
| e9b0694c0b | |||
| 14aa681e7d | |||
| c2e3545f46 | |||
| aed5afbfa7 | |||
| 9b7c6ee3fe | |||
| a8322872ab | |||
| e5318b688b | |||
| 455259f3ef | |||
| 7d2d29a42c | |||
| 5ed9fd75cc | |||
| ca71642ecf | |||
| 4369288928 | |||
| f167bbf2c4 | |||
| 1b60af57e0 | |||
| 947202f915 | |||
| 7eb6371104 | |||
| c315f366f3 | |||
| f2a2a98ad9 | |||
| 5b606153de | |||
| 87396a1b5e | |||
| b35a2987cc | |||
| 2baed25204 | |||
| 3f5a3f9ded | |||
| 6189a7bbdb | |||
| d1cda34a52 | |||
| fdbacba4bb | |||
| 5c56f3a2db | |||
| 17bb35c559 | |||
| ed25f0fdde | |||
| a18e35f4c3 | |||
| f9817da531 | |||
| d94c6321aa | |||
| 3c77bad4ae | |||
| aa36776490 | |||
| d375b04941 | |||
| cceb0b1721 | |||
| e364f9da1c | |||
| aec847070f | |||
| 11f7440273 | |||
| 02cde83181 | |||
| a302c87724 | |||
| d61ef86dd6 | |||
| 071fe476a6 | |||
| 9b611d1dcb | |||
| 61c1720fd7 |
@@ -1,6 +1,2 @@
|
||||
github: [fabiocaccamo]
|
||||
patreon: fabiocaccamo
|
||||
ko_fi: fabiocaccamo
|
||||
liberapay: fabiocaccamo
|
||||
issuehunt: fabiocaccamo
|
||||
custom: ['https://www.paypal.me/fabiocaccamo']
|
||||
|
||||
+34
-18
@@ -76,6 +76,10 @@ jobs:
|
||||
env: TOX_ENV=py36-dj31-sqlite
|
||||
- python: "3.6"
|
||||
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"
|
||||
env: TOX_ENV=py36-djmaster-sqlite
|
||||
- python: "3.6"
|
||||
@@ -100,6 +104,10 @@ jobs:
|
||||
env: TOX_ENV=py37-dj31-sqlite
|
||||
- python: "3.7"
|
||||
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"
|
||||
env: TOX_ENV=py37-djmaster-sqlite
|
||||
- python: "3.7"
|
||||
@@ -116,26 +124,34 @@ jobs:
|
||||
env: TOX_ENV=py38-dj31-sqlite
|
||||
- python: "3.8"
|
||||
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"
|
||||
env: TOX_ENV=py38-djmaster-sqlite
|
||||
- python: "3.8"
|
||||
env: TOX_ENV=py38-djmaster-postgres
|
||||
# - python: "3.9"
|
||||
# env: TOX_ENV=py39-dj22-sqlite
|
||||
# - python: "3.9"
|
||||
# env: TOX_ENV=py39-dj22-postgres
|
||||
# - python: "3.9"
|
||||
# env: TOX_ENV=py39-dj30-sqlite
|
||||
# - python: "3.9"
|
||||
# env: TOX_ENV=py39-dj30-postgres
|
||||
# - python: "3.9"
|
||||
# env: TOX_ENV=py39-dj31-sqlite
|
||||
# - python: "3.9"
|
||||
# env: TOX_ENV=py39-dj31-postgres
|
||||
# - python: "3.9"
|
||||
# env: TOX_ENV=py39-djmaster-sqlite
|
||||
# - python: "3.9"
|
||||
# env: TOX_ENV=py39-djmaster-postgres
|
||||
- python: "3.9"
|
||||
env: TOX_ENV=py39-dj22-sqlite
|
||||
- python: "3.9"
|
||||
env: TOX_ENV=py39-dj22-postgres
|
||||
- python: "3.9"
|
||||
env: TOX_ENV=py39-dj30-sqlite
|
||||
- python: "3.9"
|
||||
env: TOX_ENV=py39-dj30-postgres
|
||||
- python: "3.9"
|
||||
env: TOX_ENV=py39-dj31-sqlite
|
||||
- python: "3.9"
|
||||
env: TOX_ENV=py39-dj31-postgres
|
||||
- python: "3.9"
|
||||
env: TOX_ENV=py39-dj32-sqlite
|
||||
- python: "3.9"
|
||||
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:
|
||||
- env: TOX_ENV=py36-djmaster-sqlite
|
||||
- env: TOX_ENV=py36-djmaster-postgres
|
||||
@@ -143,8 +159,8 @@ jobs:
|
||||
- env: TOX_ENV=py37-djmaster-postgres
|
||||
- env: TOX_ENV=py38-djmaster-sqlite
|
||||
- env: TOX_ENV=py38-djmaster-postgres
|
||||
# - env: TOX_ENV=py39-djmaster-sqlite
|
||||
# - env: TOX_ENV=py39-djmaster-postgres
|
||||
- env: TOX_ENV=py39-djmaster-sqlite
|
||||
- env: TOX_ENV=py39-djmaster-postgres
|
||||
install:
|
||||
- pip install tox
|
||||
services:
|
||||
|
||||
@@ -4,6 +4,65 @@ 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/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [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
|
||||
- Fixed body classes template rendering.
|
||||
- Improved sticky submit and pagination backward compatibility.
|
||||
|
||||
## [0.15.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.1) - 2021-02-03
|
||||
- Fixed and improved sticky form controls and pagination style.
|
||||
|
||||
## [0.15.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.0) - 2021-02-03
|
||||
- Added sticky form controls and pagination options. #110
|
||||
- Added support to 4-digit language code in language chooser. #111
|
||||
- Added theme css variables for third-party libraries.
|
||||
- Fixed app module section link hover color.
|
||||
|
||||
## [0.14.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.14.2) - 2021-01-04
|
||||
- Fixed tabular inline scroll bar. #101
|
||||
- Fixed module header selected link color. #102
|
||||
- Fixed main content width when `admin.site.enable_nav_sidebar = False`. #105
|
||||
|
||||
## [0.14.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.14.1) - 2020-11-12
|
||||
- Fixed sticky list-filter floating. #100
|
||||
|
||||
## [0.14.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.14.0) - 2020-10-15
|
||||
- Added list filter sticky option (only for `django >= 3.1.2`).
|
||||
- Enabled list filter dropdown by default.
|
||||
- Fixed changelist searchbar style.
|
||||
|
||||
## [0.13.7](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.7) - 2020-10-14
|
||||
- Improved responsive widgets style.
|
||||
- Prevented body horizontal scroll.
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2016 Fabio Caccamo - fabio.caccamo@gmail.com
|
||||
Copyright (c) 2016 - present, Fabio Caccamo - fabio.caccamo@gmail.com
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@@ -22,10 +22,12 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
|
||||
- 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)*
|
||||
- `NEW` **Environment name/marker**
|
||||
- `NEW` **Language chooser**
|
||||
- Related modal *(instead of the old popup window)*
|
||||
- Environment name/marker
|
||||
- Language chooser
|
||||
- List filter dropdown
|
||||
- `NEW` **List filter sticky**
|
||||
- `NEW` **Form controls sticky** *(pagination and save/delete buttons)*
|
||||
- Compatibility / Style optimizations for:
|
||||
- `django-ckeditor`
|
||||
- `django-dynamic-raw-id`
|
||||
@@ -77,7 +79,7 @@ Run ``python manage.py loaddata admin_interface_theme_foundation.json``
|
||||
Run ``python manage.py loaddata admin_interface_theme_uswds.json``
|
||||
|
||||
### Add more themes
|
||||
You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add :
|
||||
You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add:
|
||||
|
||||
1. Export your exact theme as fixture using the `dumpdata` admin command:
|
||||
``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
|
||||
@@ -88,6 +90,34 @@ You can add a theme you've created through the admin to this repository by [send
|
||||
|
||||
4. Edit the section above to document your theme.
|
||||
|
||||
### Add theme support to third-party libraries
|
||||
You can add **theme support to existing third-party libraries** using the following **css variables**:
|
||||
|
||||
- `--admin-interface-title-color`
|
||||
- `--admin-interface-logo-color`
|
||||
- `--admin-interface-env-color`
|
||||
- `--admin-interface-header-background-color:`
|
||||
- `--admin-interface-header-text-color`
|
||||
- `--admin-interface-header-link-color`
|
||||
- `--admin-interface-header-link_hover-color`
|
||||
- `--admin-interface-module-background-color`
|
||||
- `--admin-interface-module-background-selected-color`
|
||||
- `--admin-interface-module-text-color`
|
||||
- `--admin-interface-module-link-color`
|
||||
- `--admin-interface-module-link-selected-color`
|
||||
- `--admin-interface-module-link-hover-color`
|
||||
- `--admin-interface-generic-link-color`
|
||||
- `--admin-interface-generic-link-hover-color`
|
||||
- `--admin-interface-save-button-background-color`
|
||||
- `--admin-interface-save-button-background-hover-color`
|
||||
- `--admin-interface-save-button-text-color`
|
||||
- `--admin-interface-delete-button-background-color`
|
||||
- `--admin-interface-delete-button-background-hover-color`
|
||||
- `--admin-interface-delete-button-text-color`
|
||||
- `--admin-interface-related-modal-background-color`
|
||||
- `--admin-interface-related-modal-background-opacity`
|
||||
|
||||
|
||||
## Screenshots
|
||||
###### Admin login
|
||||

|
||||
@@ -133,6 +163,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
|
||||
|
||||
- [`django-colorfield`](https://github.com/fabiocaccamo/django-colorfield) - simple color field for models with a nice color-picker in the admin. 🎨
|
||||
@@ -148,3 +191,5 @@ Released under [MIT License](LICENSE.txt).
|
||||
- [`python-benedict`](https://github.com/fabiocaccamo/python-benedict) - dict subclass with keylist/keypath support, I/O shortcuts (base64, csv, json, pickle, plist, query-string, toml, xml, yaml) and many utilities. 📘
|
||||
|
||||
- [`python-codicefiscale`](https://github.com/fabiocaccamo/python-codicefiscale) - encode/decode Italian fiscal codes - codifica/decodifica del Codice Fiscale. 🇮🇹 💳
|
||||
|
||||
- [`python-fsutil`](https://github.com/fabiocaccamo/python-fsutil) - file-system utilities for lazy devs. 🧟♂️
|
||||
|
||||
@@ -71,8 +71,10 @@ class ThemeAdmin(admin.ModelAdmin):
|
||||
'classes': ('wide', ),
|
||||
'fields': (
|
||||
'css_module_background_color',
|
||||
'css_module_background_selected_color',
|
||||
'css_module_text_color',
|
||||
'css_module_link_color',
|
||||
'css_module_link_selected_color',
|
||||
'css_module_link_hover_color',
|
||||
'css_module_rounded_corners',
|
||||
)
|
||||
@@ -110,9 +112,19 @@ class ThemeAdmin(admin.ModelAdmin):
|
||||
'related_modal_close_button_visible',
|
||||
)
|
||||
}),
|
||||
(_('Form Controls'), {
|
||||
'classes': ('wide', ),
|
||||
'fields': (
|
||||
'form_submit_sticky',
|
||||
'form_pagination_sticky',
|
||||
)
|
||||
}),
|
||||
(_('List Filter'), {
|
||||
'classes': ('wide', ),
|
||||
'fields': ('list_filter_dropdown', )
|
||||
'fields': (
|
||||
'list_filter_dropdown',
|
||||
'list_filter_sticky',
|
||||
)
|
||||
}),
|
||||
(_('Recent Actions'), {
|
||||
'classes': ('wide', ),
|
||||
|
||||
@@ -13,6 +13,7 @@ class AdminInterfaceConfig(AppConfig):
|
||||
|
||||
name = 'admin_interface'
|
||||
verbose_name = _('Admin Interface')
|
||||
default_auto_field = 'django.db.models.AutoField'
|
||||
|
||||
def ready(self):
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('admin_interface', '0016_add_language_chooser_display'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='theme',
|
||||
name='list_filter_dropdown',
|
||||
field=models.BooleanField(default=True, verbose_name='use dropdown'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('admin_interface', '0017_change_list_filter_dropdown'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='theme',
|
||||
name='list_filter_sticky',
|
||||
field=models.BooleanField(default=True, verbose_name='sticky position'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,23 @@
|
||||
# Generated by Django 3.1.5 on 2021-01-29 20:29
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('admin_interface', '0018_theme_list_filter_sticky'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='theme',
|
||||
name='form_pagination_sticky',
|
||||
field=models.BooleanField(default=False, verbose_name='sticky pagination'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='theme',
|
||||
name='form_submit_sticky',
|
||||
field=models.BooleanField(default=False, verbose_name='sticky submit'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,27 @@
|
||||
import colorfield.fields
|
||||
from django.db import migrations
|
||||
from django.db.models import F
|
||||
|
||||
def default_link_selected(apps, schema_editor):
|
||||
Theme = apps.get_model("admin_interface", "Theme")
|
||||
Theme.objects.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),
|
||||
]
|
||||
@@ -7,6 +7,11 @@ from admin_interface.cache import del_cached_active_theme
|
||||
from colorfield.fields import ColorField
|
||||
|
||||
import django
|
||||
if django.VERSION >= (1, 11):
|
||||
from django.core.validators import FileExtensionValidator
|
||||
else:
|
||||
FileExtensionValidator = lambda allowed_extensions: None
|
||||
|
||||
from django.db import models
|
||||
from django.db.models.signals import post_delete, post_save, pre_save
|
||||
if django.VERSION < (2, 0):
|
||||
@@ -99,6 +104,8 @@ class Theme(models.Model):
|
||||
logo = models.FileField(
|
||||
upload_to='admin-interface/logo/',
|
||||
blank=True,
|
||||
validators=[FileExtensionValidator(
|
||||
allowed_extensions=['gif', 'jpg', 'jpeg', 'png', 'svg'])],
|
||||
help_text=_('Leave blank to use the default Django logo'),
|
||||
verbose_name=_('logo'))
|
||||
logo_color = ColorField(
|
||||
@@ -114,6 +121,8 @@ class Theme(models.Model):
|
||||
favicon = models.FileField(
|
||||
upload_to='admin-interface/favicon/',
|
||||
blank=True,
|
||||
validators=[FileExtensionValidator(
|
||||
allowed_extensions=['gif', 'ico', 'jpg', 'jpeg', 'png', 'svg'])],
|
||||
help_text=_('(.ico|.png|.gif - 16x16|32x32 px)'),
|
||||
verbose_name=_('favicon'))
|
||||
|
||||
@@ -178,6 +187,12 @@ class Theme(models.Model):
|
||||
help_text='#44B78B',
|
||||
max_length=10,
|
||||
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(
|
||||
blank=True,
|
||||
default='#FFFFFF',
|
||||
@@ -190,6 +205,12 @@ class Theme(models.Model):
|
||||
help_text='#FFFFFF',
|
||||
max_length=10,
|
||||
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(
|
||||
blank=True,
|
||||
default='#C9F0DD',
|
||||
@@ -289,12 +310,23 @@ class Theme(models.Model):
|
||||
verbose_name=_('close button visible'))
|
||||
|
||||
list_filter_dropdown = models.BooleanField(
|
||||
default=False,
|
||||
default=True,
|
||||
verbose_name=_('use dropdown'))
|
||||
list_filter_sticky = models.BooleanField(
|
||||
default=True,
|
||||
verbose_name=_('sticky position'))
|
||||
|
||||
recent_actions_visible = models.BooleanField(
|
||||
default=True,
|
||||
verbose_name=_('visible'))
|
||||
|
||||
form_submit_sticky = models.BooleanField(
|
||||
default=False,
|
||||
verbose_name=_('sticky submit'))
|
||||
form_pagination_sticky = models.BooleanField(
|
||||
default=False,
|
||||
verbose_name=_('sticky pagination'))
|
||||
|
||||
def set_active(self):
|
||||
self.active = True
|
||||
self.save()
|
||||
|
||||
@@ -130,6 +130,10 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
|
||||
el.click(data, presentRelatedObjectModal);
|
||||
}
|
||||
|
||||
// assign functions to global variables
|
||||
window.presentRelatedObjectModal = presentRelatedObjectModal;
|
||||
window.presentRelatedObjectModalOnClickOn = presentRelatedObjectModalOnClickOn;
|
||||
|
||||
// django 1.7 compatibility
|
||||
// $('a.add-another').removeAttr('onclick').click({ lookup:false }, presentRelatedObjectModal);
|
||||
presentRelatedObjectModalOnClickOn('a.add-another');
|
||||
@@ -145,7 +149,10 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
|
||||
// django-dynamic-raw-id support - #61
|
||||
// https://github.com/lincolnloop/django-dynamic-raw-id
|
||||
presentRelatedObjectModalOnClickOn('a.dynamic_raw_id-related-lookup', true);
|
||||
|
||||
// show_change_link=True support
|
||||
presentRelatedObjectModalOnClickOn('a.inlinechangelink');
|
||||
});
|
||||
|
||||
})(django.jQuery);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ https://github.com/fabiocaccamo/django-admin-interface
|
||||
*/
|
||||
{% include "admin_interface/css/admin-interface.css" %}
|
||||
{% include "admin_interface/css/admin-interface-fix.css" %}
|
||||
{% include "admin_interface/css/form-controls.css" %}
|
||||
{% include "admin_interface/css/list-filter-dropdown.css" %}
|
||||
{% include "admin_interface/css/recent-actions.css" %}
|
||||
{% include "admin_interface/css/related-modal.css" %}
|
||||
@@ -36,7 +37,7 @@ https://github.com/fabiocaccamo/django-admin-interface
|
||||
</style>
|
||||
|
||||
{% 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 %}
|
||||
|
||||
{% endblock %}
|
||||
@@ -47,12 +48,13 @@ https://github.com/fabiocaccamo/django-admin-interface
|
||||
{% get_admin_interface_version as version %}
|
||||
{# 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">
|
||||
<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/related-modal.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ theme.name|slugify }}-theme{% endif %}{% endblock %}
|
||||
{% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ theme.name|slugify }}-theme{% endif %}{% if theme.form_submit_sticky %} sticky-submit {% endif %}{% if theme.form_pagination_sticky %} sticky-pagination {% endif %}{% endblock %}
|
||||
|
||||
{% block branding %}
|
||||
{% get_admin_interface_theme as theme %}
|
||||
|
||||
@@ -72,8 +72,9 @@
|
||||
/* end login fix*/
|
||||
|
||||
.admin-interface #header {
|
||||
height:auto;
|
||||
min-height:40px;
|
||||
height: auto;
|
||||
min-height: 55px;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: start;
|
||||
@@ -122,11 +123,12 @@
|
||||
padding: 0 1px;
|
||||
}
|
||||
|
||||
/*
|
||||
#changelist table tbody tr.selected {
|
||||
background-color:#FFFFCC;
|
||||
@media (min-width: 1024px) {
|
||||
.admin-interface #changelist .actions .button,
|
||||
.admin-interface #changelist .actions .action-counter {
|
||||
margin-left: 8px;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
.admin-interface #changelist .paginator {
|
||||
margin-top:-1px; /* merge 2 borders into 1 */
|
||||
@@ -170,6 +172,12 @@ body.admin-interface .paginator a.showall:visited {
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.admin-interface .inline-group .inlinechangelink {
|
||||
background-size: contain;
|
||||
padding-left: 15px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.admin-interface .file-thumbnail > a {
|
||||
display: inline-block;
|
||||
}
|
||||
@@ -184,7 +192,6 @@ body.admin-interface .paginator a.showall:visited {
|
||||
|
||||
.admin-interface form .form-row p.file-upload .clearable-file-input {
|
||||
display:inline-block;
|
||||
margin-left:
|
||||
}
|
||||
|
||||
.admin-interface form .form-row p.file-upload .clearable-file-input label {
|
||||
@@ -303,16 +310,12 @@ body.admin-interface .paginator a.showall:visited {
|
||||
}
|
||||
/* 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 */
|
||||
.admin-interface .inline-related.tabular fieldset.module {
|
||||
display: block;
|
||||
.admin-interface .inline-related.tabular {
|
||||
overflow-x: scroll;
|
||||
}
|
||||
.admin-interface .inline-related.tabular fieldset.module {
|
||||
display: contents;
|
||||
width: 100%;
|
||||
white-space: nowrap;
|
||||
position: relative;
|
||||
@@ -406,6 +409,7 @@ body.admin-interface .paginator a.showall:visited {
|
||||
-webkit-box-shadow: 4px 2px 8px -4px #DBDBDB;
|
||||
-moz-box-shadow: 4px 2px 8px -4px #DBDBDB;
|
||||
box-shadow: 4px 2px 8px -4px #DBDBDB;
|
||||
/*transition: left .3s;*/
|
||||
}
|
||||
|
||||
.admin-interface .toggle-nav-sidebar::before {
|
||||
@@ -436,6 +440,7 @@ body.admin-interface .paginator a.showall:visited {
|
||||
border-top: none;
|
||||
border-bottom: none;
|
||||
border-left: none;
|
||||
/*transition: left .3s, margin-left .3s;*/
|
||||
}
|
||||
|
||||
@media (min-width:1280px) {
|
||||
@@ -449,34 +454,38 @@ body.admin-interface .paginator a.showall:visited {
|
||||
.admin-interface #main:not(.shifted) > .content {
|
||||
max-width: 100%;
|
||||
}
|
||||
.admin-interface.change-list:not(.popup) #main.shifted > .content,
|
||||
.admin-interface.change-form:not(.popup) #main.shifted > .content {
|
||||
.admin-interface.change-list:not(.popup) #main.shifted > #nav-sidebar + .content,
|
||||
.admin-interface.change-form:not(.popup) #main.shifted > #nav-sidebar + .content {
|
||||
max-width: calc(100% - 360px);
|
||||
}
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-app .section:link,
|
||||
.admin-interface #nav-sidebar .current-app .section:visited {
|
||||
color: #FFFFCC;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-model {
|
||||
background: #FFFFCC;
|
||||
}
|
||||
|
||||
/* 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;
|
||||
}
|
||||
/* end fix */
|
||||
|
||||
.admin-interface .aligned .form-row .related-widget-wrapper .select2-container ~ .related-widget-wrapper-link {
|
||||
margin-left: 0;
|
||||
padding: 4px 8px 6px 8px;
|
||||
.admin-interface .related-widget-wrapper select + .related-widget-wrapper-link,
|
||||
.admin-interface .related-widget-wrapper .select2-container + .related-widget-wrapper-link {
|
||||
margin-left: 12px !important;
|
||||
}
|
||||
|
||||
.admin-interface .aligned .form-row .related-widget-wrapper .select2-container + .related-widget-wrapper-link {
|
||||
margin-left: 5px !important;
|
||||
@media (min-width: 768px) {
|
||||
.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 */
|
||||
@@ -485,19 +494,40 @@ body.admin-interface .paginator a.showall:visited {
|
||||
border-bottom-right-radius: 0;
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
/* fix searchbar overriden padding */
|
||||
.admin-interface #changelist #changelist-search #searchbar {
|
||||
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) {
|
||||
.admin-interface #changelist #toolbar {
|
||||
border-top: 1px solid #eee;
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
/* fixed changelist search size when there are search results and .quiet is visible */
|
||||
.admin-interface #changelist-search label img {
|
||||
margin-top: 7px;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.admin-interface #changelist-search .quiet {
|
||||
margin: 0 0 0 10px;
|
||||
align-self: center;
|
||||
flex-basis: content;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
/* fixed responsive widgets */
|
||||
.admin-interface .aligned.collapsed .form-row {
|
||||
display: none;
|
||||
|
||||
@@ -1,3 +1,73 @@
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root .admin-interface {
|
||||
--primary: #79aec8;
|
||||
--secondary: #417690;
|
||||
--accent: #f5dd5d;
|
||||
--primary-fg: #fff;
|
||||
--body-fg: #333;
|
||||
--body-bg: #fff;
|
||||
--body-quiet-color: #666;
|
||||
--body-loud-color: #000;
|
||||
--header-color: #ffc;
|
||||
--header-branding-color: var(--accent);
|
||||
--header-bg: var(--secondary);
|
||||
--header-link-color: var(--primary-fg);
|
||||
--breadcrumbs-fg: #c4dce8;
|
||||
--breadcrumbs-link-fg: var(--body-bg);
|
||||
--breadcrumbs-bg: var(--primary);
|
||||
--link-fg: #447e9b;
|
||||
--link-hover-color: #036;
|
||||
--link-selected-fg: #5b80b2;
|
||||
--hairline-color: #e8e8e8;
|
||||
--border-color: #ccc;
|
||||
--error-fg: #ba2121;
|
||||
--message-success-bg: #dfd;
|
||||
--message-warning-bg: #ffc;
|
||||
--message-error-bg: #ffefef;
|
||||
--darkened-bg: #f8f8f8;
|
||||
--selected-bg: #e4e4e4;
|
||||
--selected-row: #ffc;
|
||||
--button-fg: #fff;
|
||||
--button-bg: var(--primary);
|
||||
--button-hover-bg: #609ab6;
|
||||
--default-button-bg: var(--secondary);
|
||||
--default-button-hover-bg: #205067;
|
||||
--close-button-bg: #888;
|
||||
--close-button-hover-bg: #747474;
|
||||
--delete-button-bg: #ba2121;
|
||||
--delete-button-hover-bg: #a41515;
|
||||
--object-tools-fg: var(--button-fg);
|
||||
--object-tools-bg: var(--close-button-bg);
|
||||
--object-tools-hover-bg: var(--close-button-hover-bg);
|
||||
}
|
||||
}
|
||||
|
||||
:root .admin-interface {
|
||||
--admin-interface-title-color: {{ theme.title_color }};
|
||||
--admin-interface-logo-color: {{ theme.logo_color }};
|
||||
--admin-interface-env-color: {{ theme.env_color }};
|
||||
--admin-interface-header-background-color: {{ theme.css_header_background_color }};
|
||||
--admin-interface-header-text-color: {{ theme.css_header_text_color }};
|
||||
--admin-interface-header-link-color: {{ theme.css_header_link_color }};
|
||||
--admin-interface-header-link_hover-color: {{ theme.css_header_link_hover_color }};
|
||||
--admin-interface-module-background-color: {{ theme.css_module_background_color }};
|
||||
--admin-interface-module-background-selected-color: {{ theme.css_module_background_selected_color }};
|
||||
--admin-interface-module-text-color: {{ theme.css_module_text_color }};
|
||||
--admin-interface-module-link-color: {{ theme.css_module_link_color }};
|
||||
--admin-interface-module-link-selected-color: {{ theme.css_module_link_selected_color }};
|
||||
--admin-interface-module-link-hover-color: {{ theme.css_module_link_hover_color }};
|
||||
--admin-interface-generic-link-color: {{ theme.css_generic_link_color }};
|
||||
--admin-interface-generic-link-hover-color: {{ theme.css_generic_link_hover_color }};
|
||||
--admin-interface-save-button-background-color: {{ theme.css_save_button_background_color }};
|
||||
--admin-interface-save-button-background-hover-color: {{ theme.css_save_button_background_hover_color }};
|
||||
--admin-interface-save-button-text-color: {{ theme.css_save_button_text_color }};
|
||||
--admin-interface-delete-button-background-color: {{ theme.css_delete_button_background_color }};
|
||||
--admin-interface-delete-button-background-hover-color: {{ theme.css_delete_button_background_hover_color }};
|
||||
--admin-interface-delete-button-text-color: {{ theme.css_delete_button_text_color }};
|
||||
--admin-interface-related-modal-background-color: {{ theme.related_modal_background_color }};
|
||||
--admin-interface-related-modal-background-opacity: {{ theme.related_modal_background_opacity }};
|
||||
}
|
||||
|
||||
.admin-interface #header {
|
||||
background: {{ theme.css_header_background_color }};
|
||||
color: {{ theme.css_header_text_color }};
|
||||
@@ -40,7 +110,7 @@
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
right: 15px;
|
||||
z-index: 5;
|
||||
z-index: 10;
|
||||
}
|
||||
@media (min-width:768px) {
|
||||
.admin-interface .language-chooser {
|
||||
@@ -100,6 +170,25 @@
|
||||
border-bottom-color:rgba(255, 255, 255, 0.5);
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-app .section:link,
|
||||
.admin-interface #nav-sidebar .current-app .section:visited {
|
||||
color: {{ theme.css_module_link_selected_color }};
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-app .section:focus,
|
||||
.admin-interface #nav-sidebar .current-app .section:hover {
|
||||
color: {{ theme.css_module_link_hover_color }};
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-model {
|
||||
background: {{ theme.css_module_background_selected_color }};
|
||||
}
|
||||
|
||||
.admin-interface #changelist table tbody tr.selected {
|
||||
background-color: {{ theme.css_module_background_selected_color }};
|
||||
}
|
||||
|
||||
.admin-interface .module h2,
|
||||
.admin-interface .module caption,
|
||||
.admin-interface .module.filtered h2 {
|
||||
@@ -229,19 +318,22 @@
|
||||
.admin-interface .button.default:hover,
|
||||
.admin-interface input[type=submit].default:active,
|
||||
.admin-interface input[type=submit].default:focus,
|
||||
.admin-interface input[type=submit].default:hover {
|
||||
.admin-interface input[type=submit].default:hover,
|
||||
.admin-interface.delete-confirmation form .cancel-link:hover {
|
||||
background:{{ theme.css_save_button_background_hover_color }};
|
||||
color:{{ theme.css_save_button_text_color }};
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.admin-interface .submit-row a.deletelink:link,
|
||||
.admin-interface .submit-row a.deletelink:visited {
|
||||
.admin-interface .submit-row a.deletelink:visited,
|
||||
.admin-interface.delete-confirmation form input[type="submit"] {
|
||||
background:{{ theme.css_delete_button_background_color }};
|
||||
color:{{ theme.css_delete_button_text_color }};
|
||||
}
|
||||
|
||||
.admin-interface .submit-row a.deletelink:hover {
|
||||
.admin-interface .submit-row a.deletelink:hover,
|
||||
.admin-interface.delete-confirmation form input[type="submit"]:hover {
|
||||
background:{{ theme.css_delete_button_background_hover_color }};
|
||||
color:{{ theme.css_delete_button_text_color }};
|
||||
}
|
||||
@@ -282,11 +374,23 @@
|
||||
color:{{ theme.css_generic_link_hover_color }};
|
||||
}
|
||||
|
||||
.admin-interface .module.filtered #toolbar {
|
||||
{% if theme.css_module_rounded_corners %}
|
||||
border-radius: 4px;
|
||||
{% endif %}
|
||||
/* list-filter sticky */
|
||||
{% if theme.list_filter_sticky %}
|
||||
@media (min-width: 768px) {
|
||||
.admin-interface .module.filtered #changelist-filter {
|
||||
position: sticky;
|
||||
top: 40px;
|
||||
float: right;
|
||||
z-index: 30;
|
||||
}
|
||||
/* feature not available for django < 3.1.2 */
|
||||
.admin-interface .module.filtered #toolbar + #changelist-filter {
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
z-index: 30;
|
||||
}
|
||||
}
|
||||
{% endif %}
|
||||
|
||||
.admin-interface .module.filtered #changelist-filter {
|
||||
{% if theme.css_module_rounded_corners %}
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
/* sticky pagination */
|
||||
|
||||
.admin-interface.sticky-pagination.change-list #content-main {
|
||||
padding-bottom: 4.375rem;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-pagination.change-list .paginator {
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
z-index: 40;
|
||||
box-sizing: border-box;
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
border-radius: 0;
|
||||
border-top: 1px solid #EEEEEE;
|
||||
border-bottom: none;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-pagination.change-list.popup .paginator {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
@media (min-width:768px) {
|
||||
.admin-interface.sticky-pagination.change-list:not(.popup) .paginator {
|
||||
padding-left: 30px;
|
||||
padding-right: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width:1024px) {
|
||||
.admin-interface.sticky-pagination.change-list:not(.popup) .paginator {
|
||||
padding-left: 40px;
|
||||
padding-right: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width:1280px) {
|
||||
.admin-interface.sticky-pagination.change-list:not(.popup) #main.shifted > #nav-sidebar + .content .paginator {
|
||||
width: calc(100% - 359px);
|
||||
}
|
||||
}
|
||||
|
||||
/* sticky submit */
|
||||
|
||||
@media (min-width:768px) {
|
||||
.admin-interface.sticky-submit.change-form #content-main {
|
||||
padding-bottom: 4.375rem;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-submit.change-form .submit-row:last-of-type {
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
z-index: 40;
|
||||
box-sizing: border-box;
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
border-radius: 0;
|
||||
border-top: 1px solid #EEEEEE;
|
||||
border-bottom: none;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-submit.change-form.popup .submit-row:last-of-type {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-submit.change-form:not(.popup) .submit-row:last-of-type {
|
||||
padding-left: 30px;
|
||||
padding-right: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width:1024px) {
|
||||
.admin-interface.sticky-submit.change-form:not(.popup) .submit-row:last-of-type {
|
||||
padding-left: 40px;
|
||||
padding-right: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width:1280px) {
|
||||
.admin-interface.sticky-submit.change-form:not(.popup) #main.shifted > #nav-sidebar + .content .submit-row:last-of-type {
|
||||
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:focus,
|
||||
.admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected:hover {
|
||||
background-color: #FFFFCC;
|
||||
background-color: {{ theme.css_module_background_selected_color }};
|
||||
color: #000000;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ def get_admin_interface_languages(context):
|
||||
if not request:
|
||||
return None
|
||||
full_path = request.get_full_path()
|
||||
admin_nolang_url = re.sub(r'^\/([\w]{2})([\-\_]{1}[\w]{2})?\/', '/', full_path)
|
||||
admin_nolang_url = re.sub(r'^\/([\w]{2})([\-\_]{1}[\w]{2,4})?\/', '/', full_path)
|
||||
if admin_nolang_url == full_path:
|
||||
# ImproperlyConfigured - must include admin urls using i18n_patterns:
|
||||
# from django.conf.urls.i18n import i18n_patterns
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
__version__ = '0.13.7'
|
||||
__version__ = '0.16.2'
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
from setuptools import find_packages, setup
|
||||
|
||||
import os
|
||||
import os, sys
|
||||
|
||||
exec(open('admin_interface/version.py').read())
|
||||
|
||||
@@ -15,7 +15,8 @@ long_description_file_path = os.path.join(package_path, 'README.md')
|
||||
long_description_content_type = 'text/markdown'
|
||||
long_description = ''
|
||||
try:
|
||||
with open(long_description_file_path) as f:
|
||||
long_description_file_options = {} if sys.version_info[0] < 3 else { 'encoding':'utf-8' }
|
||||
with open(long_description_file_path, 'r', **long_description_file_options) as f:
|
||||
long_description = f.read()
|
||||
except IOError:
|
||||
pass
|
||||
@@ -54,6 +55,7 @@ setup(
|
||||
'Framework :: Django :: 2.2',
|
||||
'Framework :: Django :: 3.0',
|
||||
'Framework :: Django :: 3.1',
|
||||
'Framework :: Django :: 3.2',
|
||||
'Intended Audience :: Developers',
|
||||
'License :: OSI Approved :: MIT License',
|
||||
'Natural Language :: English',
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django
|
||||
import os
|
||||
|
||||
@@ -91,6 +93,15 @@ DATABASES = {
|
||||
'default': database_config.get(database_engine),
|
||||
}
|
||||
|
||||
USE_I18N = True
|
||||
LANGUAGES = (
|
||||
('en', 'English', ),
|
||||
('it', 'Italian', ),
|
||||
)
|
||||
LANGUAGE_CODE = 'en'
|
||||
|
||||
ROOT_URLCONF = 'tests.urls'
|
||||
|
||||
MEDIA_ROOT = os.path.join(BASE_DIR, 'admin_interface/public/media/')
|
||||
MEDIA_URL = '/media/'
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.core.management import call_command
|
||||
from django.test import TestCase
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.test import TestCase
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import ImproperlyConfigured
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django.test import TestCase
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.test import override_settings, TestCase
|
||||
from django.test.client import RequestFactory
|
||||
from django.template import Context, Template
|
||||
|
||||
@@ -20,6 +22,63 @@ class AdminInterfaceTemplateTagsTestCase(TestCase):
|
||||
def __render_template(self, string, context=None):
|
||||
return Template(string).render(Context(context or {}))
|
||||
|
||||
def test_get_admin_interface_languages(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/en/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
expected_languages = [
|
||||
{'code': 'en', 'name': 'English', 'default': True, 'active': True, 'activation_url': '/i18n/setlang/?next=/en/admin/'},
|
||||
{'code': 'it', 'name': 'Italian', 'default': False, 'active': False, 'activation_url': '/i18n/setlang/?next=/it/admin/'}
|
||||
]
|
||||
self.assertEqual(len(languages), len(expected_languages))
|
||||
self.assertEqual(languages[0], expected_languages[0])
|
||||
self.assertEqual(languages[1], expected_languages[1])
|
||||
|
||||
@override_settings(
|
||||
USE_I18N = False,
|
||||
)
|
||||
def test_get_admin_interface_languages_with_i18n_disabled(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/en/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
@override_settings(
|
||||
ROOT_URLCONF = 'tests.urls_without_i18n_patterns',
|
||||
)
|
||||
def test_get_admin_interface_languages_without_i18n_url_patterns(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/en/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
@override_settings(
|
||||
LANGUAGES = (
|
||||
('en', 'English'),
|
||||
),
|
||||
)
|
||||
def test_get_admin_interface_languages_without_multiple_languages(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/en/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
def test_get_admin_interface_languages_without_request(self):
|
||||
context = Context({})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
def test_get_admin_interface_languages_without_language_prefix_in_url(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
def test_get_theme(self):
|
||||
Theme.objects.all().delete()
|
||||
context = Context({})
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django
|
||||
from django.contrib import admin
|
||||
if django.VERSION < (2, 0):
|
||||
from django.conf.urls import include, url as re_path
|
||||
else:
|
||||
from django.urls import include, re_path
|
||||
from django.conf.urls.i18n import i18n_patterns
|
||||
|
||||
|
||||
urlpatterns = []
|
||||
urlpatterns += [
|
||||
re_path(r'^i18n/', include('django.conf.urls.i18n')),
|
||||
]
|
||||
urlpatterns += i18n_patterns(
|
||||
re_path(r'^admin/', admin.site.urls),
|
||||
)
|
||||
@@ -0,0 +1,15 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django
|
||||
from django.contrib import admin
|
||||
if django.VERSION < (2, 0):
|
||||
from django.conf.urls import url as re_path
|
||||
else:
|
||||
from django.urls import re_path
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
re_path(r'^admin/', admin.site.urls),
|
||||
]
|
||||
@@ -2,10 +2,10 @@
|
||||
envlist =
|
||||
py27-{dj17,dj18,dj19,dj110,dj111}-{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},
|
||||
py37-{dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres},
|
||||
py38-{dj22,dj30,dj31,djmaster}-{sqlite,postgres},
|
||||
py39-{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,dj32,djmaster}-{sqlite,postgres},
|
||||
py38-{dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
|
||||
py39-{dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
|
||||
[testenv]
|
||||
passenv = CI TRAVIS TRAVIS_*
|
||||
deps =
|
||||
@@ -19,6 +19,7 @@ deps =
|
||||
dj22: Django == 2.2.*
|
||||
dj30: Django == 3.0.*
|
||||
dj31: Django == 3.1.*
|
||||
dj32: Django == 3.2.*
|
||||
djmaster: https://github.com/django/django/archive/master.tar.gz
|
||||
# mysql: mysqlclient
|
||||
postgres: psycopg2-binary
|
||||
|
||||
Reference in New Issue
Block a user