Updated CHANGELOG and version.

* 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>

.travis.yml

@@ -1,46 +1,57 @@
 os: linux
+dist: xenial
 language: python
-python: 3.5
 cache: pip
-env:
-  - TOX_ENV=py27-dj17-sqlite
-  - TOX_ENV=py27-dj17-postgres
-  - TOX_ENV=py27-dj18-sqlite
-  - TOX_ENV=py27-dj18-postgres
-  - TOX_ENV=py27-dj19-sqlite
-  - TOX_ENV=py27-dj19-postgres
-  - TOX_ENV=py27-dj110-sqlite
-  - TOX_ENV=py27-dj110-postgres
-  - TOX_ENV=py27-dj111-sqlite
-  - TOX_ENV=py27-dj111-postgres
-  # - TOX_ENV=py34-dj17-sqlite
-  # - TOX_ENV=py34-dj17-postgres
-  # - TOX_ENV=py34-dj18-sqlite
-  # - TOX_ENV=py34-dj18-postgres
-  # - TOX_ENV=py34-dj19-sqlite
-  # - TOX_ENV=py34-dj19-postgres
-  # - TOX_ENV=py34-dj110-sqlite
-  # - TOX_ENV=py34-dj110-postgres
-  # - TOX_ENV=py34-dj111-sqlite
-  # - TOX_ENV=py34-dj111-postgres
-  # - TOX_ENV=py34-dj20-sqlite
-  # - TOX_ENV=py34-dj20-postgres
-  - TOX_ENV=py35-dj18-sqlite
-  - TOX_ENV=py35-dj18-postgres
-  - TOX_ENV=py35-dj19-sqlite
-  - TOX_ENV=py35-dj19-postgres
-  - TOX_ENV=py35-dj110-sqlite
-  - TOX_ENV=py35-dj110-postgres
-  - TOX_ENV=py35-dj111-sqlite
-  - TOX_ENV=py35-dj111-postgres
-  - TOX_ENV=py35-dj20-sqlite
-  - TOX_ENV=py35-dj20-postgres
-  - TOX_ENV=py35-dj21-sqlite
-  - TOX_ENV=py35-dj21-postgres
-  # - TOX_ENV=py35-dj22-sqlite
-  - TOX_ENV=py35-dj22-postgres
 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"
@@ -61,58 +72,70 @@ jobs:
       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-djmaster-sqlite
     - python: "3.6"
       env: TOX_ENV=py36-djmaster-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj20-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj20-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj21-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj21-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj22-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj22-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj30-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj30-postgres
     - python: "3.7"
-      dist: xenial
+      env: TOX_ENV=py37-dj31-sqlite
+    - python: "3.7"
+      env: TOX_ENV=py37-dj31-postgres
+    - python: "3.7"
       env: TOX_ENV=py37-djmaster-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-djmaster-postgres
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj22-sqlite
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj22-postgres
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj30-sqlite
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj30-postgres
     - python: "3.8"
-      dist: xenial
+      env: TOX_ENV=py38-dj31-sqlite
+    - python: "3.8"
+      env: TOX_ENV=py38-dj31-postgres
+    - python: "3.8"
       env: TOX_ENV=py38-djmaster-sqlite
     - python: "3.8"
-      dist: xenial
       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
@@ -120,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:

CHANGELOG.md

@@ -4,6 +4,44 @@ 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.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
+
+## [0.13.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.1) - 2020-08-18
+-  Improved header and nav-sidebar style.
+-  Added `max-width` to logo.
+-  Added `requirements-dev.txt`
+
+## [0.13.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.0) - 2020-08-05
+-  Improved nav-sidebar style (`django>=3.1` support).
+-  Improved header style.
+
+## [0.12.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.12.3) - 2020-07-20
+-   Fixed unreadable text in autocomplete multi-selects. #83
+
+## [0.12.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.12.2) - 2020-04-07
+-   Fixed popup javascript error when related modal is inactive. #76
+-   Fixed js self invoking anonymous function expression.
+
 ## [0.12.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.12.1) - 2020-02-21
 -   Updated `.travis` config.
 -   Fixed custom django admin header. #75

README.md

@@ -4,6 +4,7 @@
 [![](https://img.shields.io/pypi/v/django-admin-interface.svg?color=blue&logo=pypi&logoColor=white)](https://pypi.org/project/django-admin-interface/)
 [![](https://pepy.tech/badge/django-admin-interface)](https://pepy.tech/project/django-admin-interface)
 [![](https://img.shields.io/github/stars/fabiocaccamo/django-admin-interface?logo=github)](https://github.com/fabiocaccamo/django-admin-interface/)
+[![](https://badges.pufler.dev/visits/fabiocaccamo/django-admin-interface?label=visitors&color=blue)](https://badges.pufler.dev)
 [![](https://img.shields.io/pypi/l/django-admin-interface.svg?color=blue)](https://github.com/fabiocaccamo/django-admin-interface/blob/master/LICENSE.txt)
 
 [![](https://img.shields.io/travis/fabiocaccamo/django-admin-interface?logo=travis&label=build)](https://travis-ci.org/fabiocaccamo/django-admin-interface)
@@ -28,6 +29,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 - Compatibility / Style optimizations for:
   - `django-ckeditor`
   - `django-dynamic-raw-id`
+  - `django-json-widget`
   - `django-modeltranslation`
   - `django-tabbed-admin`
   - `sorl-thumbnail`
@@ -104,7 +106,45 @@ You can add a theme you've created through the admin to this repository by [send
 
 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`
 
----
+## Testing
+```bash
+# create python virtual environment
+virtualenv testing_django_admin_interface
+
+# activate virtualenv
+cd testing_django_admin_interface && . bin/activate
+
+# clone repo
+git clone https://github.com/fabiocaccamo/django-admin-interface.git src && cd src
+
+# install dependencies
+pip install -r requirements.txt
+
+# run tests
+tox
+# or
+python setup.py test
+# or
+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. 🇮🇹 💳

admin_interface/admin.py

@@ -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):

admin_interface/apps.py

@@ -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):

admin_interface/fixtures/initial_data.json

@@ -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
+        }
+    }
+]

admin_interface/locale/fa/LC_MESSAGES/django.po

@@ -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 "پاپ آپ در حال بسته شدن..."

admin_interface/models.py

@@ -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
+if django.VERSION < (2, 0):
-from django.utils.translation import ugettext_lazy as _
+    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
 
@@ -301,7 +306,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)

admin_interface/static/admin/js/cancel.js

@@ -16,5 +16,5 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined') {
                 return false;
             });
         });
-    }(django.jQuery));
+    })(django.jQuery);
 }

admin_interface/static/admin/js/popup_response.js

@@ -2,51 +2,48 @@
 
     'use strict';
 
-    function getModalWindowData()
+    var windowRef = window;
-    {
+    var windowName, widgetName;
-        var windowRef = window;
+    var openerRef = windowRef.opener;
-        var windowName = windowRef.name;
+    if (!openerRef) {
-        var widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
+        // related modal is active
-        var modalRef = {};
+        openerRef = windowRef.parent;
-        var openerRef = windowRef.opener;
+        windowName = windowRef.name;
-        if (!openerRef) {
+        widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
-            openerRef = windowRef.parent;
+        if (typeof(openerRef.id_to_windowname) === 'function') {
-            modalRef = {
+            // django < 3.1 compatibility
-                name: openerRef.id_to_windowname(widgetName),
+            widgetName = openerRef.id_to_windowname(widgetName);
-                close: function() {
-                    openerRef.dismissRelatedObjectModal();
-                }
-            };
         }
-        return { opener:openerRef, modal:modalRef };
+        windowRef = {
+            name: widgetName,
+            close: function() {
+                openerRef.dismissRelatedObjectModal();
+            }
+        };
     }
 
-    var modalData = getModalWindowData();
+    // default django popup_response.js
-    var modalRef = modalData['modal'];
-    var openerRef = modalData['opener'];
-
     var initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);
-    // console.log(initData);
     switch (initData.action) {
         case 'change':
             if (typeof(openerRef.dismissChangeRelatedObjectPopup) === 'function') {
-                openerRef.dismissChangeRelatedObjectPopup(modalRef, initData.value, initData.obj, initData.new_value);
+                openerRef.dismissChangeRelatedObjectPopup(windowRef, initData.value, initData.obj, initData.new_value);
             }
             break;
         case 'delete':
             if (typeof(openerRef.dismissDeleteRelatedObjectPopup) === 'function') {
-                openerRef.dismissDeleteRelatedObjectPopup(modalRef, initData.value);
+                openerRef.dismissDeleteRelatedObjectPopup(windowRef, initData.value);
             }
             break;
         default:
             if (typeof(openerRef.dismissAddRelatedObjectPopup) === 'function') {
-                openerRef.dismissAddRelatedObjectPopup(modalRef, initData.value, initData.obj);
+                openerRef.dismissAddRelatedObjectPopup(windowRef, initData.value, initData.obj);
             }
             else if (typeof(openerRef.dismissAddAnotherPopup) === 'function') {
                 // django 1.7 compatibility
-                openerRef.dismissAddAnotherPopup(modalRef, initData.value, initData.obj);
+                openerRef.dismissAddAnotherPopup(windowRef, initData.value, initData.obj);
             }
             break;
     }
 
-}());
+})();

admin_interface/static/admin_interface/related-modal/related-modal.js

@@ -147,5 +147,5 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
             presentRelatedObjectModalOnClickOn('a.dynamic_raw_id-related-lookup', true);
         });
 
-    }(django.jQuery));
+    })(django.jQuery);
 }

admin_interface/templates/admin/base_site.html

@@ -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 }}
@@ -25,12 +26,19 @@ https://github.com/fabiocaccamo/django-admin-interface
 {% include "admin_interface/css/tabbed-admin.css" %}
 {% 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 %}
@@ -68,5 +76,5 @@ https://github.com/fabiocaccamo/django-admin-interface
     {% get_admin_interface_languages as languages %}
     {% include "admin_interface/language_chooser.html" %}
 {% endif %}
-{% if theme.env_visible_in_header %}<span class="environment-label {{ theme.env_name }}"></span> - {% endif %}{{ block.super }}<br>
+{% if theme.env_visible_in_header %}<span class="environment-label {{ theme.env_name }}"></span><br>{% endif %}{{ block.super }}<br>
 {% endblock %}

admin_interface/templates/admin_interface/css/admin-interface-fix.css

@@ -1,68 +1,89 @@
+/* fix login */
 .admin-interface.login #container {
-    width:320px;
+    width: 100%;
-    margin:90px auto;
+    max-width: 360px;
-    box-sizing:border-box;
+    margin: 15px auto;
-    -moz-box-sizing:border-box;
+    box-sizing: border-box;
-    -webkit-box-sizing:border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
 }
 
 .admin-interface.login #content {
-    padding:15px 30px 10px 30px;
+    padding: 15px 30px 30px 30px;
 }
 
-@media (max-width:767px){
+@media (min-width:768px){
-
     .admin-interface.login #container {
-        margin:0px auto;
+        margin: 90px auto;
-    }
-
-    .admin-interface.login #content {
-        padding:20px 30px 30px 30px;
     }
 }
 
 .admin-interface.login #header {
-    padding:15px 30px 10px;
+    padding: 10px 30px;
-    line-height:30px;
+    line-height: 30px;
+    align-items: flex-start;
+    justify-content: flex-start;
 }
 
-.admin-interface.login #branding h1 {
+.admin-interface.login #header #branding h1 {
     margin-right:0;
 }
 
-.admin-interface.login #branding h1 img.logo {
+.admin-interface.login #header #branding h1 img.logo {
-    max-width:100%;
+    max-width: 100%;
-    margin-right:0;
+    margin-right: 0;
 }
 
 .admin-interface.login #header #branding h1 img.logo+span {
-    display:block;
+    display: block;
     margin-bottom: 5px;
 }
 
-.admin-interface.login .submit-row {
+.admin-interface.login #login-form {
-    padding-left:0;
+    display: flex;
-    text-align:right;
+    flex-direction: column;
 }
 
-@media (max-width:767px){
+.admin-interface.login .submit-row {
-    .admin-interface.login .submit-row label {
+    float: left;
-        display:none;
+    width: 100%;
-    }
+    margin-top: 20px;
-    .admin-interface.login .submit-row {
+    padding-top: 0;
-        float: left;
+    padding-left: 0;
-        width: 100%;
+    text-align: right;
-        margin-top: 20px;
-        margin-bottom: 30px;
-    }
 }
 
+.admin-interface.login .submit-row label {
+    display: none;
+}
+
+.admin-interface.login .submit-row input[type="submit"] {
+    width: 100%;
+    text-transform: uppercase;
+}
+
+.admin-interface.login #footer {
+    display: none;
+}
+/* end login fix*/
+
+
 .admin-interface #header {
     height:auto;
     min-height:40px;
+    display: flex;
+    justify-content: space-between;
+    align-items: start;
+}
+
+@media (max-width:1024px) {
+    .admin-interface #header {
+        align-items: flex-start;
+    }
 }
 
 .admin-interface #branding h1 img.logo {
+    max-width: 400px;
     max-height:100px;
     margin-top:10px;
     margin-bottom:10px;
@@ -70,6 +91,17 @@
     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;
+}
+
 .admin-interface #branding h1 img.logo+span {
     white-space:nowrap;
 }
@@ -224,6 +256,7 @@ body.admin-interface .paginator a.showall:visited {
 .admin-interface .module.filtered #changelist-filter {
     border-bottom-left-radius:4px;
     border-bottom-right-radius:4px;
+    min-width: 200px;
 }
 
 .admin-interface .module.filtered #changelist-filter h2 {
@@ -240,10 +273,13 @@ body.admin-interface .paginator a.showall:visited {
 /* begin fix lateral padding to align text with field labels */
 .admin-interface .module h2,
 .admin-interface.dashboard .module caption,
+.admin-interface.dashboard .module th,
 .admin-interface .module.filtered h2,
-.admin-interface .inline-group h2 {
+.admin-interface .inline-group h2,
-    padding-left:10px;
+.admin-interface #nav-sidebar .module caption,
-    padding-right:10px;
+.admin-interface #nav-sidebar .module th {
+    padding-left: 10px;
+    padding-right: 10px;
 }
 /* end fix */
 
@@ -337,3 +373,103 @@ body.admin-interface .paginator a.showall:visited {
 .admin-interface .selector:not(.stacked) .selector-chosen select {
     height: calc(46px + 17.2em) !important;
 }
+
+/* fix nav-sidebar (added in django 3.1.0) */
+.admin-interface #toggle-nav-sidebar {
+    top: 10px;
+    left: 0;
+    z-index: 20;
+    flex: 0 0 30px;
+    width: 30px;
+    height: 45px;
+    margin-top: 10px;
+    margin-right: 10px;
+    background-color: #FFFFFF;
+    font-size: 16px;
+    border: 1px solid #eaeaea;
+    border-left: none;
+    outline: none;
+    -webkit-box-shadow: 4px 2px 8px -4px #DBDBDB;
+    -moz-box-shadow: 4px 2px 8px -4px #DBDBDB;
+    box-shadow: 4px 2px 8px -4px #DBDBDB;
+}
+
+.admin-interface .toggle-nav-sidebar::before {
+    margin-top: -2px;
+}
+
+/* hide nav-sidebar below 1280px to prevent horizontal overflow issues */
+@media (max-width:1279px) {
+    .admin-interface #nav-sidebar,
+    .admin-interface #toggle-nav-sidebar {
+        display: none;
+    }
+}
+
+.admin-interface #nav-sidebar {
+    flex: 0 0 320px;
+    left: -320px;
+    margin-left: -360px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    padding: 40px 40px 40px 0px;
+    border-top: none;
+    border-bottom: none;
+    border-left: none;
+}
+
+@media (min-width:1280px) {
+    .admin-interface #main.shifted > #toggle-nav-sidebar {
+        left: 359px;
+    }
+    .admin-interface #main.shifted > #nav-sidebar {
+        left: 0px;
+        margin-left: 0;
+    }
+    .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 {
+        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;
+        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;
+}

admin_interface/templates/admin_interface/css/json-widget.css

@@ -0,0 +1,29 @@
+/*
+django-json-widget support
+https://github.com/jmrivas86/django-json-widget
+*/
+
+.admin-interface div.jsoneditor {
+    border: 1px solid {{ theme.css_module_background_color }};
+    {% if theme.css_module_rounded_corners %}
+    border-radius: 4px;
+    overflow: hidden;
+    {% endif %}
+}
+
+.admin-interface div.jsoneditor-menu {
+    background-color: {{ theme.css_module_background_color }};
+    border-bottom: 1px solid {{ theme.css_module_background_color }};
+}
+
+.admin-interface div.jsoneditor-menu a.jsoneditor-poweredBy {
+    color: {{ theme.css_module_link_color }};
+}
+
+.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;
+    color: #000000;
+    font-weight: bold;
+}

admin_interface/templates/admin_interface/css/rtl.css

@@ -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;
+}

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.12.1'
+__version__ = '0.13.6'

requirements.txt

@@ -1,4 +1,8 @@
+codecov
+coverage
+django>=1.7
 django-colorfield
 django-flat-theme
 django-flat-responsive
-six>=1.9.0
+six>=1.9.0
+tox

setup.py

@@ -53,6 +53,7 @@ setup(
         'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
@@ -65,6 +66,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',

tests/settings.py

@@ -58,6 +58,7 @@ TEMPLATES = [{
         'context_processors': [
             'django.contrib.auth.context_processors.auth',
             'django.contrib.messages.context_processors.messages',
+            'django.template.context_processors.request',
         ]
     },
 },]

tests/test_fixtures.py

@@ -17,6 +17,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')

tox.ini

@@ -1,23 +1,24 @@
 [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,djmaster}-{sqlite,postgres},
+    py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres},
-    py37-{dj20,dj21,dj22,dj30,djmaster}-{sqlite,postgres},
+    py37-{dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres},
-    py38-{dj22,dj30,djmaster}-{sqlite,postgres},
+    py38-{dj22,dj30,dj31,djmaster}-{sqlite,postgres},
+    py39-{dj22,dj30,dj31,djmaster}-{sqlite,postgres},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
-    dj17: Django >= 1.7, < 1.8
+    dj17: Django == 1.7.*
-    dj18: Django >= 1.8, < 1.9
+    dj18: Django == 1.8.*
-    dj19: Django >= 1.9, < 1.10
+    dj19: Django == 1.9.*
-    dj110: Django >= 1.10, < 1.11
+    dj110: Django == 1.10.*
-    dj111: Django >= 1.11, < 1.12
+    dj111: Django == 1.11.*
-    dj20: Django >= 2.0, < 2.1
+    dj20: Django == 2.0.*
-    dj21: Django >= 2.1, < 2.2
+    dj21: Django == 2.1.*
-    dj22: Django >= 2.2, < 2.3
+    dj22: Django == 2.2.*
-    dj30: Django >= 3.0, < 3.1
+    dj30: Django == 3.0.*
+    dj31: Django == 3.1.*
     djmaster: https://github.com/django/django/archive/master.tar.gz
     # mysql: mysqlclient
     postgres: psycopg2-binary