Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d46dfafc2 | |||
| 3f076578bb | |||
| cc4c379465 | |||
| c9f0795a95 | |||
| 042e93a84b | |||
| c9e800b5ab | |||
| 7257fbffb3 | |||
| 1f690978bf | |||
| 3d9cfd134d | |||
| 017f905330 | |||
| 796cea4a49 | |||
| 0178e0ccff | |||
| 70ed000f08 | |||
| 294f8520ab | |||
| 1b28c183f0 |
@@ -0,0 +1,29 @@
|
|||||||
|
name: Create release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- '*.*.*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Extract release notes
|
||||||
|
id: extract-release-notes
|
||||||
|
uses: ffurrer2/extract-release-notes@v1
|
||||||
|
|
||||||
|
- name: Create release
|
||||||
|
uses: actions/create-release@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
tag_name: ${{ github.ref }}
|
||||||
|
release_name: ${{ github.ref }}
|
||||||
|
draft: false
|
||||||
|
prerelease: false
|
||||||
|
body: ${{ steps.extract-release-notes.outputs.release_notes }}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
name: Test package
|
||||||
|
|
||||||
|
on:
|
||||||
|
- push
|
||||||
|
- pull_request
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
|
||||||
|
|
||||||
|
services:
|
||||||
|
postgres:
|
||||||
|
image: postgres:latest
|
||||||
|
env:
|
||||||
|
POSTGRES_USER: postgres
|
||||||
|
POSTGRES_PASSWORD: postgres
|
||||||
|
POSTGRES_DB: postgres
|
||||||
|
ports:
|
||||||
|
- 5432:5432
|
||||||
|
# needed because the postgres container does not provide a healthcheck
|
||||||
|
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
|
||||||
|
|
||||||
|
steps:
|
||||||
|
|
||||||
|
- uses: actions/checkout@v1
|
||||||
|
|
||||||
|
- name: Set up Python ${{ matrix.python-version }}
|
||||||
|
uses: actions/setup-python@v2
|
||||||
|
with:
|
||||||
|
python-version: ${{ matrix.python-version }}
|
||||||
|
cache: 'pip'
|
||||||
|
|
||||||
|
- name: Install psycopg2 prerequisites
|
||||||
|
run: sudo apt-get install libpq-dev
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
pip install -r requirements.txt
|
||||||
|
pip install -r requirements-test.txt
|
||||||
|
pip install tox tox-gh-actions
|
||||||
|
|
||||||
|
- name: Test with tox
|
||||||
|
run: tox
|
||||||
-171
@@ -1,171 +0,0 @@
|
|||||||
os: linux
|
|
||||||
dist: xenial
|
|
||||||
language: python
|
|
||||||
cache: pip
|
|
||||||
jobs:
|
|
||||||
include:
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj17-sqlite
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj17-postgres
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj18-sqlite
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj18-postgres
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj19-sqlite
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj19-postgres
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj110-sqlite
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj110-postgres
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj111-sqlite
|
|
||||||
- python: "2.7"
|
|
||||||
env: TOX_ENV=py27-dj111-postgres
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj18-sqlite
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj18-postgres
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj19-sqlite
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj19-postgres
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj110-sqlite
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj110-postgres
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj111-sqlite
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj111-postgres
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj20-sqlite
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj20-postgres
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj21-sqlite
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj21-postgres
|
|
||||||
# - python: "3.5"
|
|
||||||
# env: TOX_ENV=py35-dj22-sqlite
|
|
||||||
- python: "3.5"
|
|
||||||
env: TOX_ENV=py35-dj22-postgres
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj111-sqlite
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj111-postgres
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj20-sqlite
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj20-postgres
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj21-sqlite
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj21-postgres
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj22-sqlite
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj22-postgres
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj30-sqlite
|
|
||||||
- python: "3.6"
|
|
||||||
env: TOX_ENV=py36-dj30-postgres
|
|
||||||
- python: "3.6"
|
|
||||||
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"
|
|
||||||
env: TOX_ENV=py36-djmaster-postgres
|
|
||||||
- python: "3.7"
|
|
||||||
env: TOX_ENV=py37-dj20-sqlite
|
|
||||||
- python: "3.7"
|
|
||||||
env: TOX_ENV=py37-dj20-postgres
|
|
||||||
- python: "3.7"
|
|
||||||
env: TOX_ENV=py37-dj21-sqlite
|
|
||||||
- python: "3.7"
|
|
||||||
env: TOX_ENV=py37-dj21-postgres
|
|
||||||
- python: "3.7"
|
|
||||||
env: TOX_ENV=py37-dj22-sqlite
|
|
||||||
- python: "3.7"
|
|
||||||
env: TOX_ENV=py37-dj22-postgres
|
|
||||||
- python: "3.7"
|
|
||||||
env: TOX_ENV=py37-dj30-sqlite
|
|
||||||
- python: "3.7"
|
|
||||||
env: TOX_ENV=py37-dj30-postgres
|
|
||||||
- python: "3.7"
|
|
||||||
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"
|
|
||||||
env: TOX_ENV=py37-djmaster-postgres
|
|
||||||
- python: "3.8"
|
|
||||||
env: TOX_ENV=py38-dj22-sqlite
|
|
||||||
- python: "3.8"
|
|
||||||
env: TOX_ENV=py38-dj22-postgres
|
|
||||||
- python: "3.8"
|
|
||||||
env: TOX_ENV=py38-dj30-sqlite
|
|
||||||
- python: "3.8"
|
|
||||||
env: TOX_ENV=py38-dj30-postgres
|
|
||||||
- python: "3.8"
|
|
||||||
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-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
|
|
||||||
- env: TOX_ENV=py37-djmaster-sqlite
|
|
||||||
- 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
|
|
||||||
install:
|
|
||||||
- pip install tox
|
|
||||||
services:
|
|
||||||
- postgresql
|
|
||||||
before_script:
|
|
||||||
- psql -c 'create database admin_interface;' -U postgres
|
|
||||||
script:
|
|
||||||
- tox -e $TOX_ENV
|
|
||||||
@@ -4,6 +4,18 @@ 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.18.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.18.4) - 2022-01-05
|
||||||
|
- Added official django 4.0 support.
|
||||||
|
- Added link to admin home page on logo and title. #147
|
||||||
|
- Fixed collapsed inlines rounded bottom borders.
|
||||||
|
- Fixed missing comma in tests settings `MIDDLEWARE_CLASSES`. #145
|
||||||
|
|
||||||
|
## [0.18.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.18.3) - 2021-12-07
|
||||||
|
- Added official python 3.10 support.
|
||||||
|
- Replaced travis with GitHub action workflow. #142
|
||||||
|
- Fixed `check_installed_apps` checks.
|
||||||
|
- Fixed django default appconfig deprecation warning. #141
|
||||||
|
|
||||||
## [0.18.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.18.2) - 2021-10-25
|
## [0.18.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.18.2) - 2021-10-25
|
||||||
- Fixed migration error.
|
- Fixed migration error.
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
[](https://badges.pufler.dev)
|
[](https://badges.pufler.dev)
|
||||||
[](https://github.com/fabiocaccamo/django-admin-interface/blob/master/LICENSE.txt)
|
[](https://github.com/fabiocaccamo/django-admin-interface/blob/master/LICENSE.txt)
|
||||||
|
|
||||||
[](https://travis-ci.org/fabiocaccamo/django-admin-interface)
|
[](https://github.com/fabiocaccamo/django-admin-interface)
|
||||||
[](https://codecov.io/gh/fabiocaccamo/django-admin-interface)
|
[](https://codecov.io/gh/fabiocaccamo/django-admin-interface)
|
||||||
[](https://www.codacy.com/app/fabiocaccamo/django-admin-interface)
|
[](https://www.codacy.com/app/fabiocaccamo/django-admin-interface)
|
||||||
[](https://codeclimate.com/github/fabiocaccamo/django-admin-interface/)
|
[](https://codeclimate.com/github/fabiocaccamo/django-admin-interface/)
|
||||||
@@ -18,6 +18,8 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
|
|||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
- 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**)*
|
||||||
@@ -37,6 +39,8 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
|
|||||||
- `django-tabbed-admin`
|
- `django-tabbed-admin`
|
||||||
- `sorl-thumbnail`
|
- `sorl-thumbnail`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
- Run `pip install django-admin-interface`
|
- Run `pip install django-admin-interface`
|
||||||
- Add `admin_interface`, `flat_responsive`, `flat` and `colorfield` to `settings.INSTALLED_APPS` **before** `django.contrib.admin`
|
- Add `admin_interface`, `flat_responsive`, `flat` and `colorfield` to `settings.INSTALLED_APPS` **before** `django.contrib.admin`
|
||||||
@@ -66,6 +70,8 @@ SILENCED_SYSTEM_CHECKS = ['security.W019']
|
|||||||
- Run ``python manage.py collectstatic --clear``
|
- Run ``python manage.py collectstatic --clear``
|
||||||
- Restart your application server
|
- Restart your application server
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Optional themes
|
## Optional themes
|
||||||
This package ships with optional themes as fixtures, they can be installed using the [loaddata admin command](https://docs.djangoproject.com/en/1.11/ref/django-admin/#django-admin-loaddata). Optional themes are activated on installation.
|
This package ships with optional themes as fixtures, they can be installed using the [loaddata admin command](https://docs.djangoproject.com/en/1.11/ref/django-admin/#django-admin-loaddata). Optional themes are activated on installation.
|
||||||
|
|
||||||
@@ -120,6 +126,7 @@ You can add **theme support to existing third-party libraries** using the follow
|
|||||||
- `--admin-interface-related-modal-background-color`
|
- `--admin-interface-related-modal-background-color`
|
||||||
- `--admin-interface-related-modal-background-opacity`
|
- `--admin-interface-related-modal-background-opacity`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
###### Admin login
|
###### Admin login
|
||||||
@@ -134,11 +141,50 @@ You can add **theme support to existing third-party libraries** using the follow
|
|||||||
###### Admin theme customization
|
###### Admin theme customization
|
||||||

|

|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## FAQ
|
## FAQ
|
||||||
- #### I already have a custom `base_site.html`, how can I make it work?
|
|
||||||
|
### Custom `base-site.html`
|
||||||
|
> I already have a custom `base_site.html`, how can I make it work?
|
||||||
|
|
||||||
You can use [django-apptemplates](https://github.com/bittner/django-apptemplates), then add `{% extends "admin_interface:admin/base_site.html" %}` to your `base_site.html`
|
You can use [django-apptemplates](https://github.com/bittner/django-apptemplates), then add `{% extends "admin_interface:admin/base_site.html" %}` to your `base_site.html`
|
||||||
|
|
||||||
|
### Language Chooser not showing
|
||||||
|
> I have enabled the **Language Chooser**, but it is not visible in the admin, what should I do?
|
||||||
|
|
||||||
|
You must configure multilanguage `settings` and `urls` correctly:
|
||||||
|
```python
|
||||||
|
LANGUAGES = (
|
||||||
|
('en', _('English')),
|
||||||
|
('it', _('Italiano')),
|
||||||
|
('fr', _('Française')),
|
||||||
|
# more than one language is expected here
|
||||||
|
)
|
||||||
|
LANGUAGE_CODE = 'en'
|
||||||
|
USE_I18N = True
|
||||||
|
MIDDLEWARE = [
|
||||||
|
# ...
|
||||||
|
'django.middleware.locale.LocaleMiddleware',
|
||||||
|
# ...
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
```python
|
||||||
|
from django.conf.urls.i18n import i18n_patterns
|
||||||
|
from django.contrib import admin
|
||||||
|
from django.urls import include, path
|
||||||
|
|
||||||
|
# ...
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path('i18n/', include('django.conf.urls.i18n')),
|
||||||
|
]
|
||||||
|
urlpatterns += i18n_patterns(path('admin/', admin.site.urls))
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
```bash
|
```bash
|
||||||
# create python virtual environment
|
# create python virtual environment
|
||||||
@@ -152,6 +198,7 @@ git clone https://github.com/fabiocaccamo/django-admin-interface.git src && cd s
|
|||||||
|
|
||||||
# install dependencies
|
# install dependencies
|
||||||
pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
|
pip install -r requirements-test.txt
|
||||||
|
|
||||||
# run tests
|
# run tests
|
||||||
tox
|
tox
|
||||||
@@ -161,24 +208,13 @@ python setup.py test
|
|||||||
python -m django test --settings "tests.settings"
|
python -m django test --settings "tests.settings"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## License
|
## License
|
||||||
Released under [MIT License](LICENSE.txt).
|
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. 🎨
|
||||||
@@ -195,4 +231,6 @@ If you are using this package in commercial project(s), please consider the idea
|
|||||||
|
|
||||||
- [`python-codicefiscale`](https://github.com/fabiocaccamo/python-codicefiscale) - encode/decode Italian fiscal codes - codifica/decodifica del Codice Fiscale. 🇮🇹 💳
|
- [`python-codicefiscale`](https://github.com/fabiocaccamo/python-codicefiscale) - encode/decode Italian fiscal codes - codifica/decodifica del Codice Fiscale. 🇮🇹 💳
|
||||||
|
|
||||||
|
- [`python-fontbro`](https://github.com/fabiocaccamo/python-fontbro) - friendly font operations. 🧢
|
||||||
|
|
||||||
- [`python-fsutil`](https://github.com/fabiocaccamo/python-fsutil) - file-system utilities for lazy devs. 🧟♂️
|
- [`python-fsutil`](https://github.com/fabiocaccamo/python-fsutil) - file-system utilities for lazy devs. 🧟♂️
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
# -*- coding: utf-8 -*-
|
import django
|
||||||
|
|
||||||
default_app_config = 'admin_interface.apps.AdminInterfaceConfig'
|
if django.VERSION < (3, 2):
|
||||||
|
default_app_config = 'admin_interface.apps.AdminInterfaceConfig'
|
||||||
|
|||||||
@@ -5,23 +5,30 @@ from django.conf import settings
|
|||||||
from django.core.exceptions import ImproperlyConfigured
|
from django.core.exceptions import ImproperlyConfigured
|
||||||
|
|
||||||
|
|
||||||
def check_installed_app(app, app_dj_version_limit):
|
def check_installed_app(app, max_dj_version=None):
|
||||||
dj_version = django.VERSION
|
dj_version = django.VERSION
|
||||||
installed_apps = settings.INSTALLED_APPS
|
installed_apps = settings.INSTALLED_APPS
|
||||||
if dj_version < app_dj_version_limit:
|
if max_dj_version is None:
|
||||||
if app not in installed_apps:
|
if app not in installed_apps:
|
||||||
raise ImproperlyConfigured(
|
raise ImproperlyConfigured(
|
||||||
'\'{}\' needed before django {}.{}, '
|
'\'{}\' is required, '
|
||||||
'add it to settings.INSTALLED_APPS.'.format(
|
'add it to settings.INSTALLED_APPS.'.format(
|
||||||
app, *app_dj_version_limit))
|
app))
|
||||||
|
elif dj_version < max_dj_version:
|
||||||
|
if app not in installed_apps:
|
||||||
|
raise ImproperlyConfigured(
|
||||||
|
'\'{}\' is required before django {}.{}, '
|
||||||
|
'add it to settings.INSTALLED_APPS.'.format(
|
||||||
|
app, *max_dj_version))
|
||||||
else:
|
else:
|
||||||
if app in installed_apps:
|
if app in installed_apps:
|
||||||
raise ImproperlyConfigured(
|
raise ImproperlyConfigured(
|
||||||
'\'{}\' not needed since django {}.{}, '
|
'\'{}\' is no more required since django {}.{}, '
|
||||||
'remove it from settings.INSTALLED_APPS.'.format(
|
'remove it from settings.INSTALLED_APPS.'.format(
|
||||||
app, *app_dj_version_limit))
|
app, *max_dj_version))
|
||||||
|
|
||||||
|
|
||||||
def check_installed_apps():
|
def check_installed_apps():
|
||||||
check_installed_app('flat', (1, 9))
|
check_installed_app('colorfield')
|
||||||
check_installed_app('flat_responsive', (2, 0))
|
check_installed_app('flat', max_dj_version=(1, 9))
|
||||||
|
check_installed_app('flat_responsive', max_dj_version=(2, 0))
|
||||||
|
|||||||
@@ -66,16 +66,18 @@ flat-theme admin-interface
|
|||||||
{% block branding %}
|
{% block branding %}
|
||||||
{% get_admin_interface_theme as theme %}
|
{% get_admin_interface_theme as theme %}
|
||||||
<h1 id="site-name">
|
<h1 id="site-name">
|
||||||
{% if theme.logo_visible %}
|
<a href="{% url 'admin:index' %}">
|
||||||
{% if theme.logo %}
|
{% if theme.logo_visible %}
|
||||||
<img class="logo" style="display:none;" src="{{ theme.logo.url }}" {% if theme.logo.width %}width="{{ theme.logo.width }}"{% endif %} {% if theme.logo.height %}height="{{ theme.logo.height }}"{% endif %}>
|
{% if theme.logo %}
|
||||||
{% else %}
|
<img class="logo" style="display:none;" src="{{ theme.logo.url }}" {% if theme.logo.width %}width="{{ theme.logo.width }}"{% endif %} {% if theme.logo.height %}height="{{ theme.logo.height }}"{% endif %}>
|
||||||
<img class="logo default" style="display:none;" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="104" height="36">
|
{% else %}
|
||||||
|
<img class="logo default" style="display:none;" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="104" height="36">
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% if theme.title_visible %}
|
||||||
{% if theme.title_visible %}
|
<span>{% if theme.title %}{% trans theme.title %}{% else %}{{ site_header|default:_('Django administration') }}{% endif %}</span>
|
||||||
<span>{% if theme.title %}{% trans theme.title %}{% else %}{{ site_header|default:_('Django administration') }}{% endif %}</span>
|
{% endif %}
|
||||||
{% endif %}
|
</a>
|
||||||
</h1>
|
</h1>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
|||||||
@@ -137,6 +137,10 @@
|
|||||||
color: {{ theme.title_color }};
|
color: {{ theme.title_color }};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.admin-interface #branding h1 a {
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
.admin-interface #branding h1 .logo.default {
|
.admin-interface #branding h1 .logo.default {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
@@ -431,6 +435,14 @@
|
|||||||
border-bottom-right-radius:0;
|
border-bottom-right-radius:0;
|
||||||
{% endif %}
|
{% endif %}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.admin-interface .module.collapse.collapsed h2 {
|
||||||
|
/* fix collapsed inlines rounded bottom borders */
|
||||||
|
{% if theme.css_module_rounded_corners %}
|
||||||
|
border-bottom-left-radius:4px;
|
||||||
|
border-bottom-right-radius:4px;
|
||||||
|
{% endif %}
|
||||||
|
}
|
||||||
/* end fix */
|
/* end fix */
|
||||||
|
|
||||||
.admin-interface #content-related {
|
.admin-interface #content-related {
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
__version__ = '0.18.2'
|
__version__ = '0.18.4'
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
codecov
|
||||||
|
coverage
|
||||||
|
psycopg2
|
||||||
|
tox
|
||||||
@@ -1,8 +1,5 @@
|
|||||||
codecov
|
|
||||||
coverage
|
|
||||||
django>=1.7
|
django>=1.7
|
||||||
django-colorfield
|
django-colorfield
|
||||||
django-flat-theme
|
django-flat-theme
|
||||||
django-flat-responsive
|
django-flat-responsive
|
||||||
six>=1.9.0
|
six>=1.9.0
|
||||||
tox
|
|
||||||
@@ -56,6 +56,7 @@ setup(
|
|||||||
'Framework :: Django :: 3.0',
|
'Framework :: Django :: 3.0',
|
||||||
'Framework :: Django :: 3.1',
|
'Framework :: Django :: 3.1',
|
||||||
'Framework :: Django :: 3.2',
|
'Framework :: Django :: 3.2',
|
||||||
|
'Framework :: Django :: 4.0',
|
||||||
'Intended Audience :: Developers',
|
'Intended Audience :: Developers',
|
||||||
'License :: OSI Approved :: MIT License',
|
'License :: OSI Approved :: MIT License',
|
||||||
'Natural Language :: English',
|
'Natural Language :: English',
|
||||||
@@ -69,6 +70,7 @@ setup(
|
|||||||
'Programming Language :: Python :: 3.7',
|
'Programming Language :: Python :: 3.7',
|
||||||
'Programming Language :: Python :: 3.8',
|
'Programming Language :: Python :: 3.8',
|
||||||
'Programming Language :: Python :: 3.9',
|
'Programming Language :: Python :: 3.9',
|
||||||
|
'Programming Language :: Python :: 3.10',
|
||||||
'Topic :: Software Development :: Build Tools',
|
'Topic :: Software Development :: Build Tools',
|
||||||
],
|
],
|
||||||
license='MIT',
|
license='MIT',
|
||||||
|
|||||||
+7
-1
@@ -40,7 +40,7 @@ INSTALLED_APPS += [
|
|||||||
if django.VERSION < (2, 0):
|
if django.VERSION < (2, 0):
|
||||||
MIDDLEWARE_CLASSES = [
|
MIDDLEWARE_CLASSES = [
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
'django.contrib.messages.middleware.MessageMiddleware'
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
'django.middleware.common.CommonMiddleware',
|
'django.middleware.common.CommonMiddleware',
|
||||||
]
|
]
|
||||||
@@ -89,6 +89,12 @@ database_config = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
github_workflow = os.environ.get('GITHUB_WORKFLOW')
|
||||||
|
if github_workflow:
|
||||||
|
database_config['postgres']['NAME'] = 'postgres'
|
||||||
|
database_config['postgres']['HOST'] = '127.0.0.1'
|
||||||
|
database_config['postgres']['PORT'] = '5432'
|
||||||
|
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
'default': database_config.get(database_engine),
|
'default': database_config.get(database_engine),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,23 @@
|
|||||||
[tox]
|
[tox]
|
||||||
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},
|
py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,dj32}-{sqlite,postgres},
|
||||||
py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
|
py37-{dj20,dj21,dj22,dj30,dj31,dj32}-{sqlite,postgres},
|
||||||
py37-{dj20,dj21,dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
|
py38-{dj22,dj30,dj31,dj32}-{sqlite,postgres},
|
||||||
py38-{dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
|
py39-{dj22,dj30,dj31,dj32}-{sqlite,postgres},
|
||||||
py39-{dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres},
|
py310-{dj32,dj40}-{sqlite,postgres},
|
||||||
|
|
||||||
|
[gh-actions]
|
||||||
|
python =
|
||||||
|
2.7: py27
|
||||||
|
3.6: py36
|
||||||
|
3.7: py37
|
||||||
|
3.8: py38
|
||||||
|
3.9: py39
|
||||||
|
3.10: py310
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
passenv = CI TRAVIS TRAVIS_*
|
passenv = CI GITHUB_WORKFLOW
|
||||||
deps =
|
deps =
|
||||||
dj17: Django == 1.7.*
|
dj17: Django == 1.7.*
|
||||||
dj18: Django == 1.8.*
|
dj18: Django == 1.8.*
|
||||||
@@ -20,7 +30,7 @@ deps =
|
|||||||
dj30: Django == 3.0.*
|
dj30: Django == 3.0.*
|
||||||
dj31: Django == 3.1.*
|
dj31: Django == 3.1.*
|
||||||
dj32: Django == 3.2.*
|
dj32: Django == 3.2.*
|
||||||
djmaster: https://github.com/django/django/archive/master.tar.gz
|
dj40: Django == 4.0.*
|
||||||
# mysql: mysqlclient
|
# mysql: mysqlclient
|
||||||
postgres: psycopg2-binary
|
postgres: psycopg2-binary
|
||||||
coverage
|
coverage
|
||||||
|
|||||||
Reference in New Issue
Block a user