Compare commits

...

46 Commits

Author SHA1 Message Date
Fabio Caccamo ed25f0fdde Updated version and CHANGELOG. 2021-01-04 13:55:07 +01:00
Fabio Caccamo a18e35f4c3 Updated LICENSE copyright year to present. 2021-01-04 13:54:57 +01:00
Fabio Caccamo f9817da531 Fixed module header selected link color. 2021-01-04 13:50:40 +01:00
Fabio Caccamo d94c6321aa Disabled sidebar transition. 2021-01-04 12:24:43 +01:00
Fabio Caccamo 3c77bad4ae Fixed tabular inline scroll bar. #101 2021-01-04 12:24:24 +01:00
Fabio Caccamo aa36776490 Fixed main content width when admin.site.enable_nav_sidebar is False. 2021-01-04 12:16:28 +01:00
anatolzak d375b04941 added transition to nav sidebar and toggle nav sidebar button (#104)
* added transition to nav sidebar and toggle nav sidebar button

* specified transition properties instead of using all

* removed extra blank line

Co-authored-by: Anatol Zakrividoroga <anatol@Anatols-MacBook-Pro.local>
2020-12-15 16:32:15 +01:00
Fabio Caccamo cceb0b1721 Updated README. [ci skip] 2020-11-27 13:11:07 +01:00
Fabio Caccamo e364f9da1c Updated CHANGELOG and version. 2020-11-12 13:28:06 +01:00
Fabio Caccamo aec847070f Fixed sticky list-filter floating. #100 2020-11-12 13:27:51 +01:00
Fabio Caccamo 11f7440273 Improved tests coverage. 2020-10-21 12:27:14 +02:00
Fabio Caccamo 02cde83181 Fixed long description encoding. 2020-10-21 12:26:31 +02:00
Fabio Caccamo a302c87724 Updated CHANGELOG and version. 2020-10-15 11:14:12 +02:00
Fabio Caccamo d61ef86dd6 Added list filter sticky option (only for django >= 3.1.2). 2020-10-15 10:49:26 +02:00
Fabio Caccamo 071fe476a6 Enabled list filter dropdown by default. 2020-10-15 10:48:16 +02:00
Fabio Caccamo 9b611d1dcb Fixed searchbar style. 2020-10-15 10:42:40 +02:00
Fabio Caccamo 61c1720fd7 Fixed searchbar style. 2020-10-15 10:06:58 +02:00
Fabio Caccamo 962267de1d Updated CHANGELOG and version. 2020-10-14 18:37:50 +02:00
Fabio Caccamo f632929183 Improved responsive widgets style. 2020-10-14 18:35:59 +02:00
Fabio Caccamo 308858a0d0 Prevented body horizontal scroll. 2020-10-14 18:35:39 +02:00
Fabio Caccamo db7e0770b2 Fixed tabular inline horizontal scroll. 2020-10-14 18:34:56 +02:00
Fabio Caccamo 195ef2c44f Fixed changelist filter min-width. 2020-10-14 18:34:31 +02:00
Fabio Caccamo 48d3952e68 Fixed changelist and toolbar theme rounded corners. 2020-10-14 18:33:41 +02:00
Fabio Caccamo 96570502cc Fixed calendar and timelist buttons theme color. 2020-10-14 18:33:14 +02:00
Fabio Caccamo 759b5a6f49 Fixed list filter select size. 2020-10-14 18:32:49 +02:00
Fabio Caccamo 92710be337 Fixed content max-width with django 3.1.2 2020-10-14 13:57:35 +02:00
Fabio Caccamo c721359eea Updated CHANGELOG and version. 2020-10-14 13:00:34 +02:00
Fabio Caccamo 79ea1729cc Fixed logo, content and changelist-filter max-width. 2020-10-14 12:55:57 +02:00
Fabio Caccamo 8c4520d4b7 Added .admin-interface prefix to rtl selectors. 2020-10-14 12:55:26 +02:00
Fabio Caccamo b703f77f80 Re-added .gitignore [ci skip] 2020-10-14 10:02:25 +02:00
Amir Ajorloo 13b1d9f15f Add persian language (#98)
* add fa language translations
* add rtl css file. fix side-nav issue in rtl mode

Co-authored-by: Amir Ajorloo <amirajorloo@gmail.coml>
Co-authored-by: Fabio Caccamo <fabio.caccamo@gmail.com>
2020-10-14 10:00:45 +02:00
Fabio Caccamo e989e623db Updated README. [ci skip] 2020-10-13 15:38:20 +02:00
Fabio Caccamo 2113d009f4 Removed python 3.9 from travis. 2020-10-07 10:50:23 +02:00
Fabio Caccamo e967d09c8b Added python 3.9 to tests. 2020-10-06 10:59:09 +02:00
Fabio Caccamo c050c4f94c Updated CHANGELOG and version. 2020-09-15 09:54:30 +02:00
Fabio Caccamo 97cea97307 Removed python 3.4 from tox test matrix. 2020-09-15 09:54:01 +02:00
Fabio Caccamo 826340c9be Fixed loaddata error with initial_data.json fixture. #97 2020-09-15 09:49:50 +02:00
Fabio Caccamo 28dfc70474 Fixed tests warning (admin.W411). 2020-09-15 09:47:01 +02:00
Fabio Caccamo e9038157be Fixed changelist thead links color. 2020-09-07 23:30:35 +02:00
Fabio Caccamo be21550c6a Fixed changelist filter links hover color. 2020-09-07 14:10:53 +02:00
Fabio Caccamo db87a2aae2 Added "See also" section to README. [ci skip] 2020-09-04 17:00:02 +02:00
Fabio Caccamo 97ac8268b6 Updated version and CHANGELOG. 2020-09-04 15:35:54 +02:00
Fabio Caccamo 941835b5ee Removed old import. 2020-09-04 15:32:58 +02:00
Fabio Caccamo b050d7cb61 Added conditional imports to avoid Django deprecation warnings. #92 2020-09-04 15:30:03 +02:00
Fabio Caccamo 7d64545031 Updated header user-tools margins. 2020-09-04 11:43:42 +02:00
Fabio Caccamo 892bfa5e16 Changed header content vertical align to top. 2020-09-02 18:08:48 +02:00
27 changed files with 768 additions and 81 deletions
+18
View File
@@ -120,6 +120,22 @@ jobs:
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
allow_failures:
- env: TOX_ENV=py36-djmaster-sqlite
- env: TOX_ENV=py36-djmaster-postgres
@@ -127,6 +143,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
install:
- pip install tox
services:
+42
View File
@@ -4,6 +4,48 @@ 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.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.
- Fixed tabular inline horizontal scroll.
- Fixed changelist filter min-width.
- Fixed changelist and toolbar theme rounded corners.
- Fixed calendar and timelist buttons theme color.
- Fixed list filter select size.
- Fixed content max-width with `django >= 3.1`.
## [0.13.6](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.6) - 2020-10-14
- Added persian language. #98
- Fixed logo max-width on small screens.
- Fixed content max-width when nav-sidebar is collapsed.
- Fixed changelist max-width on medium screens.
## [0.13.5](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.5) - 2020-09-15
- Fixed loaddata error with initial_data.json fixture. #97
- Fixed tests warning (admin.W411).
- Fixed changelist thead links color.
- Fixed changelist filter links hover color.
## [0.13.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.4) - 2020-09-04
- Added conditional imports to avoid Django deprecation warnings. #92
- Changed admin header content vertical align to top.
## [0.13.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.3) - 2020-09-02
- Added `django-json-widget` theming support.
## [0.13.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.2) - 2020-08-21
- Fixed related modal not closing on edit save and create with django 3.1 - #96
+1 -1
View File
@@ -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
+20 -2
View File
@@ -128,7 +128,25 @@ python setup.py test
python -m django test --settings "tests.settings"
```
---
## License
Released under [MIT License](LICENSE.txt).
---
## See also
- [`django-colorfield`](https://github.com/fabiocaccamo/django-colorfield) - simple color field for models with a nice color-picker in the admin. 🎨
- [`django-extra-settings`](https://github.com/fabiocaccamo/django-extra-settings) - config and manage typed extra settings using just the django admin. ⚙️
- [`django-maintenance-mode`](https://github.com/fabiocaccamo/django-maintenance-mode) - shows a 503 error page when maintenance-mode is on. 🚧 🛠️
- [`django-redirects`](https://github.com/fabiocaccamo/django-redirects) - redirects with full control. ↪️
- [`django-treenode`](https://github.com/fabiocaccamo/django-treenode) - probably the best abstract model / admin for your tree based stuff. 🌳
- [`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. 🧟‍♂️
+9 -2
View File
@@ -2,8 +2,12 @@
from admin_interface.models import Theme
import django
from django.contrib import admin
from django.utils.translation import ugettext_lazy as _
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):
@@ -108,7 +112,10 @@ class ThemeAdmin(admin.ModelAdmin):
}),
(_('List Filter'), {
'classes': ('wide', ),
'fields': ('list_filter_dropdown', )
'fields': (
'list_filter_dropdown',
'list_filter_sticky',
)
}),
(_('Recent Actions'), {
'classes': ('wide', ),
+5 -1
View File
@@ -1,8 +1,12 @@
# -*- coding: utf-8 -*-
import django
from django.apps import AppConfig
from django.db.models.signals import post_migrate
from django.utils.translation import ugettext_lazy as _
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):
+39 -1
View File
@@ -1 +1,39 @@
[{"model": "admin_interface.theme", "pk": 1, "fields": {"name": "Django", "active": true, "title": "Django administration", "title_visible": true, "logo": "", "logo_visible": true, "css_header_background_color": "#0C4B33", "css_header_title_color": "#F5DD5D", "css_header_text_color": "#44B78B", "css_header_link_color": "#FFFFFF", "css_header_link_hover_color": "#C9F0DD", "css_module_background_color": "#44B78B", "css_module_text_color": "#FFFFFF", "css_module_link_color": "#FFFFFF", "css_module_link_hover_color": "#C9F0DD", "css_module_rounded_corners": true, "css_generic_link_color": "#0C3C26", "css_generic_link_hover_color": "#156641", "css_save_button_background_color": "#0C4B33", "css_save_button_background_hover_color": "#0C3C26", "css_save_button_text_color": "#FFFFFF", "css_delete_button_background_color": "#BA2121", "css_delete_button_background_hover_color": "#A41515", "css_delete_button_text_color": "#FFFFFF", "css": "", "related_modal_active": true, "related_modal_background_color": "#000000", "related_modal_background_opacity": 0.2, "related_modal_rounded_corners": true, "list_filter_dropdown": false}}]
[
{
"model": "admin_interface.theme",
"fields": {
"name": "Django",
"active": true,
"title": "Django administration",
"title_color": "#F5DD5D",
"title_visible": true,
"logo": "",
"logo_color": "#FFFFFF",
"logo_visible": true,
"css_header_background_color": "#0C4B33",
"css_header_text_color": "#44B78B",
"css_header_link_color": "#FFFFFF",
"css_header_link_hover_color": "#C9F0DD",
"css_module_background_color": "#44B78B",
"css_module_text_color": "#FFFFFF",
"css_module_link_color": "#FFFFFF",
"css_module_link_hover_color": "#C9F0DD",
"css_module_rounded_corners": true,
"css_generic_link_color": "#0C3C26",
"css_generic_link_hover_color": "#156641",
"css_save_button_background_color": "#0C4B33",
"css_save_button_background_hover_color": "#0C3C26",
"css_save_button_text_color": "#FFFFFF",
"css_delete_button_background_color": "#BA2121",
"css_delete_button_background_hover_color": "#A41515",
"css_delete_button_text_color": "#FFFFFF",
"css": "",
"related_modal_active": true,
"related_modal_background_color": "#000000",
"related_modal_background_opacity": 0.2,
"related_modal_rounded_corners": true,
"list_filter_dropdown": false,
"recent_actions_visible": true
}
}
]
Binary file not shown.
@@ -0,0 +1,205 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Amir Ajorloo <amirajorloo@gmail.com>, 2020.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: django-admin-interface\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-12 19:23+0330\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Amir Ajorloo <amirajorloo@gmail.com>\n"
"Language-Team: Farsi <LL@li.org>\n"
"Language: Farsi"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: admin_interface/admin.py:21
msgid "Environment"
msgstr "محیط"
#: admin_interface/admin.py:30
msgid "Language chooser"
msgstr "انتخاب زبان"
#: admin_interface/admin.py:37
msgid "Logo"
msgstr "لوگو"
#: admin_interface/admin.py:45
msgid "Favicon"
msgstr "آیکون تب"
#: admin_interface/admin.py:49
msgid "Title"
msgstr "عنوان"
#: admin_interface/admin.py:57
msgid "Header"
msgstr "هدر"
#: admin_interface/admin.py:66
msgid "Breadcrumbs / Module headers"
msgstr "مسیر صفحه"
#: admin_interface/admin.py:76
msgid "Generic Links"
msgstr "لینک‌های عمومی"
#: admin_interface/admin.py:83
msgid "Save Buttons"
msgstr "دکمه‌های ذخیره"
#: admin_interface/admin.py:91
msgid "Delete Buttons"
msgstr "دکمه‌های حذف"
#: admin_interface/admin.py:99
msgid "Related Modal"
msgstr "مدل‌های مرتبط"
#: admin_interface/admin.py:109
msgid "List Filter"
msgstr "فیلتر‌های لیست"
#: admin_interface/admin.py:113
msgid "Recent Actions"
msgstr "فعالیت‌های اخیر"
#: admin_interface/apps.py:11
msgid "Admin Interface"
msgstr "ظاهر ادمین"
#: admin_interface/models.py:72 admin_interface/models.py:116
#: admin_interface/models.py:135
msgid "name"
msgstr "نام"
#: admin_interface/models.py:75 admin_interface/models.py:132
#: admin_interface/models.py:253
msgid "active"
msgstr "فعال"
#: admin_interface/models.py:79
#: admin_interface/templates/admin/base_site.html:6
#: admin_interface/templates/admin/base_site.html:60
msgid "Django administration"
msgstr "مدیریت جنگو"
#: admin_interface/models.py:81
msgid "title"
msgstr "عنوان"
#: admin_interface/models.py:87 admin_interface/models.py:102
#: admin_interface/models.py:122
msgid "color"
msgstr "رنگ"
#: admin_interface/models.py:90 admin_interface/models.py:105
#: admin_interface/models.py:289
msgid "visible"
msgstr "نمایان"
#: admin_interface/models.py:95
msgid "Leave blank to use the default Django logo"
msgstr "برای نمایش لوگوی پیش فرض، خالی بگذارید."
#: admin_interface/models.py:96
msgid "logo"
msgstr "لوگو"
#: admin_interface/models.py:110
msgid "(.ico|.png|.gif - 16x16|32x32 px)"
msgstr "(.ico|.png|.gif - 16x16|32x32 px)"
#: admin_interface/models.py:111
msgid "favicon"
msgstr "آیکون تب"
#: admin_interface/models.py:120
msgid ""
"(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: "
"#3498DB)"
msgstr ""
"(قرمز: #E74C3C, نارنجی: #E67E22, زرد: #F1C40F, سبز: #2ECC71, آبی: "
"#3498DB)"
#: admin_interface/models.py:125
msgid "visible in header (marker and name)"
msgstr "نمایان در هدر"
#: admin_interface/models.py:128
msgid "visible in favicon (marker)"
msgstr "نمایان در آیکون تب"
#: admin_interface/models.py:134
msgid "code"
msgstr "کد"
#: admin_interface/models.py:141
msgid "display"
msgstr "نمایش"
#: admin_interface/models.py:148 admin_interface/models.py:173
#: admin_interface/models.py:214 admin_interface/models.py:233
#: admin_interface/models.py:259
msgid "background color"
msgstr "رنگ پس‌زمینه"
#: admin_interface/models.py:154 admin_interface/models.py:179
#: admin_interface/models.py:226 admin_interface/models.py:245
#: admin_interface/models.py:249
msgid "text color"
msgstr "رنگ متن"
#: admin_interface/models.py:160 admin_interface/models.py:185
#: admin_interface/models.py:201
msgid "link color"
msgstr "رنگ لینک"
#: admin_interface/models.py:166 admin_interface/models.py:191
#: admin_interface/models.py:207
msgid "link hover color"
msgstr "رنگ لینک در حالت هاور"
#: admin_interface/models.py:194 admin_interface/models.py:279
msgid "rounded corners"
msgstr "گوشه‌های خمیده"
#: admin_interface/models.py:220 admin_interface/models.py:239
msgid "background hover color"
msgstr "رنگ پس‌زمینه در حالت هاور"
#: admin_interface/models.py:276
msgid "background opacity"
msgstr "شفافیت بکگراند"
#: admin_interface/models.py:282
msgid "close button visible"
msgstr "دکمه بستن نمایان باشد"
#: admin_interface/models.py:286
msgid "use dropdown"
msgstr "استفاده از دراپ داون"
#: admin_interface/models.py:298
msgid "Theme"
msgstr "تم"
#: admin_interface/models.py:299
msgid "Themes"
msgstr "تم‌ها"
#: admin_interface/templates/admin/filter.html:13
#: admin_interface/templates/admin_interface/dropdown_filter.html:4
#, python-format
msgid " By %(filter_title)s "
msgstr " توسط %(filter_title)s "
#: admin_interface/templates/admin/popup_response.html:3
msgid "Popup closing..."
msgstr "پاپ آپ در حال بسته شدن..."
@@ -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'),
),
]
+13 -4
View File
@@ -6,10 +6,15 @@ from admin_interface.cache import del_cached_active_theme
from colorfield.fields import ColorField
import django
from django.db import models
from django.db.models.signals import post_delete, post_save, pre_save
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
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
@@ -284,8 +289,12 @@ 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'))
@@ -301,7 +310,7 @@ class Theme(models.Model):
verbose_name_plural = _('Themes')
def __str__(self):
return force_text(self.name)
return force_str(self.name)
post_delete.connect(Theme.post_delete_handler, sender=Theme)
@@ -9,6 +9,7 @@
{% block extrastyle %}
{% get_admin_interface_theme as theme %}
{% get_admin_interface_version as version %}
{% get_current_language as current_lang %}
<style type="text/css">
/*
django-admin-interface {{ version }}
@@ -26,12 +27,18 @@ https://github.com/fabiocaccamo/django-admin-interface
{% include "admin_interface/css/ckeditor.css" %}
{% include "admin_interface/css/tinymce.css" %}
{% include "admin_interface/css/json-widget.css" %}
{% include "admin_interface/css/rtl.css" %}
{% if theme.css %}
{{ theme.css|safe }}
{% endif %}
</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" />
{% endif %}
{% endblock %}
{% block blockbots %}
@@ -1,3 +1,7 @@
.admin-interface {
overflow-x: hidden;
}
/* fix login */
.admin-interface.login #container {
width: 100%;
@@ -67,13 +71,12 @@
}
/* end login fix*/
.admin-interface #header {
height:auto;
min-height:40px;
display: flex;
justify-content: space-between;
align-items: center;
align-items: start;
}
@media (max-width:1024px) {
@@ -91,6 +94,12 @@
display:inline-block !important; /* override inline display:none; */
}
@media (max-width:400px) {
.admin-interface #branding h1 img.logo {
max-width: 100%;
}
}
.admin-interface #branding h1 span {
display: inline-block;
margin-bottom: 5px;
@@ -113,12 +122,6 @@
padding: 0 1px;
}
/*
#changelist table tbody tr.selected {
background-color:#FFFFCC;
}
*/
.admin-interface #changelist .paginator {
margin-top:-1px; /* merge 2 borders into 1 */
line-height:42px;
@@ -203,6 +206,7 @@ body.admin-interface .paginator a.showall:visited {
.admin-interface form .form-row p.file-upload .clearable-file-input {
display: block;
margin-top: 10px;
margin-left: 0;
margin-bottom: -10px;
}
@@ -243,13 +247,18 @@ body.admin-interface .paginator a.showall:visited {
/* LIST FILTER */
.admin-interface .module.filtered h2 {
border-bottom-left-radius:0;
border-bottom-right-radius:0;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.admin-interface .module.filtered #changelist-filter {
border-bottom-left-radius:4px;
border-bottom-right-radius:4px;
min-width: 240px;
}
@media (max-width: 1024px) {
.admin-interface .module.filtered #changelist-filter {
min-width: 200px;
}
}
.admin-interface .module.filtered #changelist-filter h2 {
@@ -294,6 +303,23 @@ body.admin-interface .paginator a.showall:visited {
}
/* end fix */
/* begin fix tabular inlines horizontal scroll */
.admin-interface .inline-related.tabular fieldset.module {
display: contents;
overflow-x: scroll;
width: 100%;
white-space: nowrap;
position: relative;
}
.admin-interface .inline-related.tabular fieldset.module h2 {
position: sticky;
left: 0;
}
.admin-interface .inline-related.tabular fieldset.module table tbody tr {
position: relative;
}
/* end fix */
.admin-interface .inline-related h3 {
padding:6px 10px;
}
@@ -335,17 +361,6 @@ body.admin-interface .paginator a.showall:visited {
background-color:#AAAAAA;
}
/* fix textarea horizontal scroll on Firefox */
@media (max-width: 767px){
.admin-interface .aligned .form-row textarea {
width: 100% !important;
flex: 0 1 auto;
}
.admin-interface .aligned .form-row input[type="file"] {
width: 100% !important;
}
}
/* improve responsive selector */
/* fix [stacked, not-stacked] equalize horizontal and vertical select padding for selector */
@@ -385,12 +400,18 @@ 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 {
margin-top: -2px;
}
.admin-interface .main > #nav-sidebar + .content,
.admin-interface .main.shifted > #nav-sidebar + .content {
max-width: 100%;
}
/* hide nav-sidebar below 1280px to prevent horizontal overflow issues */
@media (max-width:1279px) {
.admin-interface #nav-sidebar,
@@ -410,6 +431,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) {
@@ -420,46 +442,99 @@ body.admin-interface .paginator a.showall:visited {
left: 0px;
margin-left: 0;
}
.admin-interface.change-list:not(.popup) #main.shifted > .content,
.admin-interface.change-form:not(.popup) #main.shifted > .content {
.admin-interface #main:not(.shifted) > .content {
max-width: 100%;
}
.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);
}
}
/* fix related-widget when the nav-sidebar is collapsed */
@media (max-width:1100px) {
.admin-interface.change-form #main .related-widget-wrapper {
clear: left;
/* fixed related widget and select2 */
.admin-interface .aligned .form-row .related-widget-wrapper {
white-space: nowrap;
}
.admin-interface .aligned .form-row .related-widget-wrapper .select2-container ~ .related-widget-wrapper-link {
margin-left: 0;
padding: 4px 8px 6px 8px;
}
.admin-interface .aligned .form-row .related-widget-wrapper .select2-container + .related-widget-wrapper-link {
margin-left: 5px !important;
}
/* fixed time widget header border radius */
.admin-interface .clockbox.module h2 {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
/* fix searchbar overriden padding */
.admin-interface #changelist #changelist-search #searchbar {
padding: 2px 5px 3px 5px;
}
@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: 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;
}
.admin-interface .aligned .form-row > div {
display: flex;
max-width: 100vw;
flex-direction: column;
align-items: flex-start;
}
.admin-interface .aligned .form-row .help {
margin-left: 0;
}
.admin-interface .aligned .form-row .checkbox-row label {
margin: 10px 0 0 0;
padding: 0;
}
.admin-interface .aligned .form-row input[type="file"],
.admin-interface .aligned .form-row input[type="text"],
.admin-interface .aligned .form-row input[type="email"] {
width: 100%;
}
/* fix textarea horizontal scroll on Firefox */
.admin-interface .aligned .form-row textarea {
width: 100% !important;
flex: 0 1 auto;
}
.admin-interface .aligned .form-row .datetime input[type="text"] {
width: 50%;
}
.admin-interface .aligned .form-row span + .file-upload {
margin-top: 10px;
}
.admin-interface .aligned .form-row .file-upload input[type="file"] {
margin-top: 5px;
}
.admin-interface.change-form #main .related-widget-wrapper + .help {
margin-top: 10px;
margin-left: 0;
padding-left: 0;
padding-right: 0;
}
}
/* fix related-widget when the nav-sidebar is expanded */
@media (min-width:1280px) and (max-width:1480px) {
.admin-interface.change-form:not(.popup) .related-widget-wrapper {
clear: left;
margin-top: 5px;
}
.admin-interface.change-form #main.shifted .related-widget-wrapper + .help {
margin-top: 10px;
margin-left: 0;
padding-left: 0;
padding-right: 0;
}
}
.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;
}
}
@@ -76,7 +76,8 @@
}
.admin-interface #user-tools {
margin-bottom: 2px;
margin-top: 10px;
margin-bottom: 10px;
white-space: nowrap;
}
@@ -99,6 +100,20 @@
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_color }};
font-weight: normal;
}
.admin-interface #nav-sidebar .current-model {
background: #FFFFCC;
}
.admin-interface #changelist table tbody tr.selected {
background-color: #FFFFCC;
}
.admin-interface .module h2,
.admin-interface .module caption,
.admin-interface .module.filtered h2 {
@@ -184,6 +199,14 @@
color:{{ theme.css_generic_link_hover_color }};
}
.admin-interface thead th a,
.admin-interface thead th a:link,
.admin-interface thead th a:visited,
.admin-interface thead th a:focus,
.admin-interface thead th a:hover {
color: #666666;
}
.admin-interface .button,
.admin-interface input[type=submit],
.admin-interface input[type=button],
@@ -273,9 +296,48 @@
color:{{ theme.css_generic_link_hover_color }};
}
/* list-filter sticky */
{% if theme.list_filter_sticky %}
@media (min-width: 768px) {
.admin-interface .module.filtered #changelist-filter {
position: sticky;
top: 40px;
float: right;
}
/* feature not available for django < 3.1.2 */
.admin-interface .module.filtered #toolbar + #changelist-filter {
position: absolute;
top: 0px;
}
}
{% endif %}
.admin-interface .module.filtered #changelist-filter {
{% if theme.css_module_rounded_corners %}
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
{% endif %}
}
.admin-interface .module.filtered #changelist-filter #changelist-filter-clear a:focus,
.admin-interface .module.filtered #changelist-filter #changelist-filter-clear a:hover {
color: #666;
text-decoration: none;
}
.admin-interface .module.filtered #changelist-filter li a:focus,
.admin-interface .module.filtered #changelist-filter li a:hover {
color: #666;
text-decoration: none;
}
.admin-interface .module.filtered #changelist-filter li.selected a,
.admin-interface .module.filtered #changelist-filter li.selected a:link,
.admin-interface .module.filtered #changelist-filter li.selected a:visited,
.admin-interface .module.filtered #changelist-filter li.selected a:focus,
.admin-interface .module.filtered #changelist-filter li.selected a:hover {
color: {{ theme.css_generic_link_color }};
/* color: #666; */
color: {{ theme.css_generic_link_hover_color }};
}
/* begin fix issue #11 - Inline border bottom should not be rounded */
@@ -321,3 +383,13 @@
.admin-interface #toggle-nav-sidebar:active {
color: {{ theme.css_generic_link_hover_color }};
}
.admin-interface .calendar td.selected a,
.admin-interface .calendar td a:active,
.admin-interface .calendar td a:focus,
.admin-interface .calendar td a:hover,
.admin-interface .timelist a:active,
.admin-interface .timelist a:focus,
.admin-interface .timelist a:hover {
background: {{ theme.css_module_background_color }};
}
@@ -8,7 +8,7 @@ list-filter-dropdown
}
.admin-interface .list-filter-dropdown select {
background-color:#FFFFFF;
width:90%;
margin-right:5%;
background-color: #FFFFFF;
width: calc(100% - 30px);
margin-right: 15px;
}
@@ -0,0 +1,34 @@
[dir="rtl"] .admin-interface,
[dir="rtl"] .admin-interface * {
font-family: 'Vazir', sans-serif !important;
}
[dir="rtl"] .admin-interface .main .toggle-nav-sidebar.sticky {
left: auto !important;
right: 0px !important;
margin-right: 0px !important;
margin-left: 10px;
border: 1px solid #eaeaea !important;
border-right: none !important;
border-top-right-radius: 0px !important;
border-bottom-right-radius: 0px !important;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
box-shadow: -4px 2px 8px -2px #DBDBDB !important;
}
[dir="rtl"] .admin-interface #main.shifted > #toggle-nav-sidebar {
right: 359px !important;
}
[dir="rtl"] .admin-interface #main > #nav-sidebar {
margin-right: -360px !important;
margin-left: 0px !important;
right: -320px !important;
}
[dir="rtl"] .admin-interface #main.shifted > #nav-sidebar {
border-left: 1px solid #eaeaea;
margin-right: 0px !important;
padding: 40px 0px 40px 40px !important;
}
+1 -1
View File
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
__version__ = '0.13.3'
__version__ = '0.14.2'
+4 -2
View File
@@ -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
@@ -66,6 +67,7 @@ setup(
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Topic :: Software Development :: Build Tools',
],
license='MIT',
+12
View File
@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import django
import os
@@ -58,6 +60,7 @@ TEMPLATES = [{
'context_processors': [
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'django.template.context_processors.request',
]
},
},]
@@ -90,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/'
+6
View File
@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.core.management import call_command
from django.test import TestCase
@@ -17,6 +19,10 @@ class AdminInterfaceFixturesTestCase(TestCase):
def __load_theme(self, theme_name):
call_command('loaddata', 'admin_interface_theme_%s.json' % (theme_name, ))
def test_import_initial_data(self):
call_command('loaddata', 'initial_data.json')
self.assertEqual(Theme.objects.count(), 1);
def test_import_all(self):
self.__load_theme('django')
self.__load_theme('bootstrap')
+2
View File
@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.conf import settings
from django.test import TestCase
+2
View File
@@ -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
+60 -1
View File
@@ -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({})
+20
View File
@@ -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),
)
+15
View File
@@ -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),
]
+1 -1
View File
@@ -1,11 +1,11 @@
[tox]
envlist =
py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres},
py34-{dj17,dj18,dj19,dj110,dj111,dj20}-{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},
[testenv]
passenv = CI TRAVIS TRAVIS_*
deps =