Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 947202f915 | |||
| 7eb6371104 | |||
| c315f366f3 | |||
| f2a2a98ad9 | |||
| 5b606153de | |||
| 87396a1b5e | |||
| b35a2987cc | |||
| 2baed25204 | |||
| 3f5a3f9ded | |||
| 6189a7bbdb | |||
| d1cda34a52 | |||
| fdbacba4bb | |||
| 5c56f3a2db | |||
| 17bb35c559 | |||
| ed25f0fdde | |||
| a18e35f4c3 | |||
| f9817da531 | |||
| d94c6321aa | |||
| 3c77bad4ae | |||
| aa36776490 | |||
| d375b04941 | |||
| cceb0b1721 | |||
| e364f9da1c | |||
| aec847070f | |||
| 11f7440273 | |||
| 02cde83181 | |||
| a302c87724 | |||
| d61ef86dd6 | |||
| 071fe476a6 | |||
| 9b611d1dcb | |||
| 61c1720fd7 |
@@ -4,6 +4,35 @@ 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.15.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.3) - 2021-02-08
|
||||
- Fixed sticky submit and pagination width when `admin.site.enable_nav_sidebar = False`. #113
|
||||
|
||||
## [0.15.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.2) - 2021-02-03
|
||||
- Fixed body classes template rendering.
|
||||
- Improved sticky submit and pagination backward compatibility.
|
||||
|
||||
## [0.15.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.1) - 2021-02-03
|
||||
- Fixed and improved sticky form controls and pagination style.
|
||||
|
||||
## [0.15.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.15.0) - 2021-02-03
|
||||
- Added sticky form controls and pagination options. #110
|
||||
- Added support to 4-digit language code in language chooser. #111
|
||||
- Added theme css variables for third-party libraries.
|
||||
- Fixed app module section link hover color.
|
||||
|
||||
## [0.14.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.14.2) - 2021-01-04
|
||||
- Fixed tabular inline scroll bar. #101
|
||||
- Fixed module header selected link color. #102
|
||||
- Fixed main content width when `admin.site.enable_nav_sidebar = False`. #105
|
||||
|
||||
## [0.14.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.14.1) - 2020-11-12
|
||||
- Fixed sticky list-filter floating. #100
|
||||
|
||||
## [0.14.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.14.0) - 2020-10-15
|
||||
- Added list filter sticky option (only for `django >= 3.1.2`).
|
||||
- Enabled list filter dropdown by default.
|
||||
- Fixed changelist searchbar style.
|
||||
|
||||
## [0.13.7](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.7) - 2020-10-14
|
||||
- Improved responsive widgets style.
|
||||
- Prevented body horizontal scroll.
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2016 Fabio Caccamo - fabio.caccamo@gmail.com
|
||||
Copyright (c) 2016 - present, Fabio Caccamo - fabio.caccamo@gmail.com
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@@ -77,7 +77,7 @@ Run ``python manage.py loaddata admin_interface_theme_foundation.json``
|
||||
Run ``python manage.py loaddata admin_interface_theme_uswds.json``
|
||||
|
||||
### Add more themes
|
||||
You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add :
|
||||
You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add:
|
||||
|
||||
1. Export your exact theme as fixture using the `dumpdata` admin command:
|
||||
``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
|
||||
@@ -88,6 +88,32 @@ You can add a theme you've created through the admin to this repository by [send
|
||||
|
||||
4. Edit the section above to document your theme.
|
||||
|
||||
### Add theme support to third-party libraries
|
||||
You can add **theme support to existing third-party libraries** using the following **css variables**:
|
||||
|
||||
- `--admin-interface-title-color`
|
||||
- `--admin-interface-logo-color`
|
||||
- `--admin-interface-env-color`
|
||||
- `--admin-interface-header-background-color:`
|
||||
- `--admin-interface-header-text-color`
|
||||
- `--admin-interface-header-link-color`
|
||||
- `--admin-interface-header-link_hover-color`
|
||||
- `--admin-interface-module-background-color`
|
||||
- `--admin-interface-module-text-color`
|
||||
- `--admin-interface-module-link-color`
|
||||
- `--admin-interface-module-link-hover-color`
|
||||
- `--admin-interface-generic-link-color`
|
||||
- `--admin-interface-generic-link-hover-color`
|
||||
- `--admin-interface-save-button-background-color`
|
||||
- `--admin-interface-save-button-background-hover-color`
|
||||
- `--admin-interface-save-button-text-color`
|
||||
- `--admin-interface-delete-button-background-color`
|
||||
- `--admin-interface-delete-button-background-hover-color`
|
||||
- `--admin-interface-delete-button-text-color`
|
||||
- `--admin-interface-related-modal-background-color`
|
||||
- `--admin-interface-related-modal-background-opacity`
|
||||
|
||||
|
||||
## Screenshots
|
||||
###### Admin login
|
||||

|
||||
@@ -148,3 +174,5 @@ Released under [MIT License](LICENSE.txt).
|
||||
- [`python-benedict`](https://github.com/fabiocaccamo/python-benedict) - dict subclass with keylist/keypath support, I/O shortcuts (base64, csv, json, pickle, plist, query-string, toml, xml, yaml) and many utilities. 📘
|
||||
|
||||
- [`python-codicefiscale`](https://github.com/fabiocaccamo/python-codicefiscale) - encode/decode Italian fiscal codes - codifica/decodifica del Codice Fiscale. 🇮🇹 💳
|
||||
|
||||
- [`python-fsutil`](https://github.com/fabiocaccamo/python-fsutil) - file-system utilities for lazy devs. 🧟♂️
|
||||
|
||||
@@ -110,9 +110,19 @@ class ThemeAdmin(admin.ModelAdmin):
|
||||
'related_modal_close_button_visible',
|
||||
)
|
||||
}),
|
||||
(_('Form Controls'), {
|
||||
'classes': ('wide', ),
|
||||
'fields': (
|
||||
'form_submit_sticky',
|
||||
'form_pagination_sticky',
|
||||
)
|
||||
}),
|
||||
(_('List Filter'), {
|
||||
'classes': ('wide', ),
|
||||
'fields': ('list_filter_dropdown', )
|
||||
'fields': (
|
||||
'list_filter_dropdown',
|
||||
'list_filter_sticky',
|
||||
)
|
||||
}),
|
||||
(_('Recent Actions'), {
|
||||
'classes': ('wide', ),
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('admin_interface', '0016_add_language_chooser_display'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='theme',
|
||||
name='list_filter_dropdown',
|
||||
field=models.BooleanField(default=True, verbose_name='use dropdown'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('admin_interface', '0017_change_list_filter_dropdown'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='theme',
|
||||
name='list_filter_sticky',
|
||||
field=models.BooleanField(default=True, verbose_name='sticky position'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,23 @@
|
||||
# Generated by Django 3.1.5 on 2021-01-29 20:29
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('admin_interface', '0018_theme_list_filter_sticky'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='theme',
|
||||
name='form_pagination_sticky',
|
||||
field=models.BooleanField(default=False, verbose_name='sticky pagination'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='theme',
|
||||
name='form_submit_sticky',
|
||||
field=models.BooleanField(default=False, verbose_name='sticky submit'),
|
||||
),
|
||||
]
|
||||
@@ -289,12 +289,23 @@ class Theme(models.Model):
|
||||
verbose_name=_('close button visible'))
|
||||
|
||||
list_filter_dropdown = models.BooleanField(
|
||||
default=False,
|
||||
default=True,
|
||||
verbose_name=_('use dropdown'))
|
||||
list_filter_sticky = models.BooleanField(
|
||||
default=True,
|
||||
verbose_name=_('sticky position'))
|
||||
|
||||
recent_actions_visible = models.BooleanField(
|
||||
default=True,
|
||||
verbose_name=_('visible'))
|
||||
|
||||
form_submit_sticky = models.BooleanField(
|
||||
default=False,
|
||||
verbose_name=_('sticky submit'))
|
||||
form_pagination_sticky = models.BooleanField(
|
||||
default=False,
|
||||
verbose_name=_('sticky pagination'))
|
||||
|
||||
def set_active(self):
|
||||
self.active = True
|
||||
self.save()
|
||||
|
||||
@@ -17,6 +17,7 @@ https://github.com/fabiocaccamo/django-admin-interface
|
||||
*/
|
||||
{% include "admin_interface/css/admin-interface.css" %}
|
||||
{% include "admin_interface/css/admin-interface-fix.css" %}
|
||||
{% include "admin_interface/css/form-controls.css" %}
|
||||
{% include "admin_interface/css/list-filter-dropdown.css" %}
|
||||
{% include "admin_interface/css/recent-actions.css" %}
|
||||
{% include "admin_interface/css/related-modal.css" %}
|
||||
@@ -52,7 +53,7 @@ https://github.com/fabiocaccamo/django-admin-interface
|
||||
{% include "admin_interface/related-modal.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ theme.name|slugify }}-theme{% endif %}{% endblock %}
|
||||
{% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ theme.name|slugify }}-theme{% endif %}{% if theme.form_submit_sticky %} sticky-submit {% endif %}{% if theme.form_pagination_sticky %} sticky-pagination {% endif %}{% endblock %}
|
||||
|
||||
{% block branding %}
|
||||
{% get_admin_interface_theme as theme %}
|
||||
|
||||
@@ -122,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;
|
||||
@@ -311,7 +305,7 @@ body.admin-interface .paginator a.showall:visited {
|
||||
|
||||
/* begin fix tabular inlines horizontal scroll */
|
||||
.admin-interface .inline-related.tabular fieldset.module {
|
||||
display: block;
|
||||
display: contents;
|
||||
overflow-x: scroll;
|
||||
width: 100%;
|
||||
white-space: nowrap;
|
||||
@@ -406,6 +400,7 @@ body.admin-interface .paginator a.showall:visited {
|
||||
-webkit-box-shadow: 4px 2px 8px -4px #DBDBDB;
|
||||
-moz-box-shadow: 4px 2px 8px -4px #DBDBDB;
|
||||
box-shadow: 4px 2px 8px -4px #DBDBDB;
|
||||
/*transition: left .3s;*/
|
||||
}
|
||||
|
||||
.admin-interface .toggle-nav-sidebar::before {
|
||||
@@ -436,6 +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) {
|
||||
@@ -449,22 +445,12 @@ body.admin-interface .paginator a.showall:visited {
|
||||
.admin-interface #main:not(.shifted) > .content {
|
||||
max-width: 100%;
|
||||
}
|
||||
.admin-interface.change-list:not(.popup) #main.shifted > .content,
|
||||
.admin-interface.change-form:not(.popup) #main.shifted > .content {
|
||||
.admin-interface.change-list:not(.popup) #main.shifted > #nav-sidebar + .content,
|
||||
.admin-interface.change-form:not(.popup) #main.shifted > #nav-sidebar + .content {
|
||||
max-width: calc(100% - 360px);
|
||||
}
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-app .section:link,
|
||||
.admin-interface #nav-sidebar .current-app .section:visited {
|
||||
color: #FFFFCC;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-model {
|
||||
background: #FFFFCC;
|
||||
}
|
||||
|
||||
/* fixed related widget and select2 */
|
||||
.admin-interface .aligned .form-row .related-widget-wrapper {
|
||||
white-space: nowrap;
|
||||
@@ -485,19 +471,28 @@ body.admin-interface .paginator a.showall:visited {
|
||||
border-bottom-right-radius: 0;
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
/* fix searchbar overriden padding */
|
||||
.admin-interface #changelist #changelist-search #searchbar {
|
||||
padding: 2px 5px 3px 5px;
|
||||
}
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
.admin-interface #changelist #toolbar {
|
||||
border-top: 1px solid #eee;
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
/* fixed changelist search size when there are search results and .quiet is visible */
|
||||
.admin-interface #changelist-search label img {
|
||||
margin-top: 7px;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.admin-interface #changelist-search .quiet {
|
||||
margin: 0 0 0 10px;
|
||||
align-self: center;
|
||||
flex-basis: content;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
/* fixed responsive widgets */
|
||||
.admin-interface .aligned.collapsed .form-row {
|
||||
display: none;
|
||||
|
||||
@@ -1,3 +1,27 @@
|
||||
:root {
|
||||
--admin-interface-title-color: {{ theme.title_color }};
|
||||
--admin-interface-logo-color: {{ theme.logo_color }};
|
||||
--admin-interface-env-color: {{ theme.env_color }};
|
||||
--admin-interface-header-background-color: {{ theme.css_header_background_color }};
|
||||
--admin-interface-header-text-color: {{ theme.css_header_text_color }};
|
||||
--admin-interface-header-link-color: {{ theme.css_header_link_color }};
|
||||
--admin-interface-header-link_hover-color: {{ theme.css_header_link_hover_color }};
|
||||
--admin-interface-module-background-color: {{ theme.css_module_background_color }};
|
||||
--admin-interface-module-text-color: {{ theme.css_module_text_color }};
|
||||
--admin-interface-module-link-color: {{ theme.css_module_link_color }};
|
||||
--admin-interface-module-link-hover-color: {{ theme.css_module_link_hover_color }};
|
||||
--admin-interface-generic-link-color: {{ theme.css_generic_link_color }};
|
||||
--admin-interface-generic-link-hover-color: {{ theme.css_generic_link_hover_color }};
|
||||
--admin-interface-save-button-background-color: {{ theme.css_save_button_background_color }};
|
||||
--admin-interface-save-button-background-hover-color: {{ theme.css_save_button_background_hover_color }};
|
||||
--admin-interface-save-button-text-color: {{ theme.css_save_button_text_color }};
|
||||
--admin-interface-delete-button-background-color: {{ theme.css_delete_button_background_color }};
|
||||
--admin-interface-delete-button-background-hover-color: {{ theme.css_delete_button_background_hover_color }};
|
||||
--admin-interface-delete-button-text-color: {{ theme.css_delete_button_text_color }};
|
||||
--admin-interface-related-modal-background-color: {{ theme.related_modal_background_color }};
|
||||
--admin-interface-related-modal-background-opacity: {{ theme.related_modal_background_opacity }};
|
||||
}
|
||||
|
||||
.admin-interface #header {
|
||||
background: {{ theme.css_header_background_color }};
|
||||
color: {{ theme.css_header_text_color }};
|
||||
@@ -100,6 +124,25 @@
|
||||
border-bottom-color:rgba(255, 255, 255, 0.5);
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-app .section:link,
|
||||
.admin-interface #nav-sidebar .current-app .section:visited {
|
||||
color: {{ theme.css_module_link_color }};
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-app .section:focus,
|
||||
.admin-interface #nav-sidebar .current-app .section:hover {
|
||||
color: {{ theme.css_module_link_hover_color }};
|
||||
}
|
||||
|
||||
.admin-interface #nav-sidebar .current-model {
|
||||
background: #FFFFCC;
|
||||
}
|
||||
|
||||
.admin-interface #changelist table tbody tr.selected {
|
||||
background-color: #FFFFCC;
|
||||
}
|
||||
|
||||
.admin-interface .module h2,
|
||||
.admin-interface .module caption,
|
||||
.admin-interface .module.filtered h2 {
|
||||
@@ -282,11 +325,21 @@
|
||||
color:{{ theme.css_generic_link_hover_color }};
|
||||
}
|
||||
|
||||
.admin-interface .module.filtered #toolbar {
|
||||
{% if theme.css_module_rounded_corners %}
|
||||
border-radius: 4px;
|
||||
{% endif %}
|
||||
/* list-filter sticky */
|
||||
{% if theme.list_filter_sticky %}
|
||||
@media (min-width: 768px) {
|
||||
.admin-interface .module.filtered #changelist-filter {
|
||||
position: sticky;
|
||||
top: 40px;
|
||||
float: right;
|
||||
}
|
||||
/* 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 %}
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
/* sticky pagination */
|
||||
|
||||
.admin-interface.sticky-pagination.change-list #content-main {
|
||||
padding-bottom: 4.375rem;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-pagination.change-list .paginator {
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
z-index: 1;
|
||||
box-sizing: border-box;
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
border-radius: 0;
|
||||
border-top: 1px solid #EEEEEE;
|
||||
border-bottom: none;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-pagination.change-list.popup .paginator {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
@media (min-width:768px) {
|
||||
.admin-interface.sticky-pagination.change-list:not(.popup) .paginator {
|
||||
padding-left: 30px;
|
||||
padding-right: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width:1024px) {
|
||||
.admin-interface.sticky-pagination.change-list:not(.popup) .paginator {
|
||||
padding-left: 40px;
|
||||
padding-right: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width:1280px) {
|
||||
.admin-interface.sticky-pagination.change-list:not(.popup) #main.shifted > #nav-sidebar + .content .paginator {
|
||||
width: calc(100% - 359px);
|
||||
}
|
||||
}
|
||||
|
||||
/* sticky submit */
|
||||
|
||||
@media (min-width:768px) {
|
||||
.admin-interface.sticky-submit.change-form #content-main {
|
||||
padding-bottom: 4.375rem;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-submit.change-form .submit-row:last-of-type {
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
z-index: 1;
|
||||
box-sizing: border-box;
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
border-radius: 0;
|
||||
border-top: 1px solid #EEEEEE;
|
||||
border-bottom: none;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-submit.change-form.popup .submit-row:last-of-type {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
.admin-interface.sticky-submit.change-form:not(.popup) .submit-row:last-of-type {
|
||||
padding-left: 30px;
|
||||
padding-right: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width:1024px) {
|
||||
.admin-interface.sticky-submit.change-form:not(.popup) .submit-row:last-of-type {
|
||||
padding-left: 40px;
|
||||
padding-right: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width:1280px) {
|
||||
.admin-interface.sticky-submit.change-form:not(.popup) #main.shifted > #nav-sidebar + .content .submit-row:last-of-type {
|
||||
width: calc(100% - 359px);
|
||||
}
|
||||
}
|
||||
@@ -42,7 +42,7 @@ def get_admin_interface_languages(context):
|
||||
if not request:
|
||||
return None
|
||||
full_path = request.get_full_path()
|
||||
admin_nolang_url = re.sub(r'^\/([\w]{2})([\-\_]{1}[\w]{2})?\/', '/', full_path)
|
||||
admin_nolang_url = re.sub(r'^\/([\w]{2})([\-\_]{1}[\w]{2,4})?\/', '/', full_path)
|
||||
if admin_nolang_url == full_path:
|
||||
# ImproperlyConfigured - must include admin urls using i18n_patterns:
|
||||
# from django.conf.urls.i18n import i18n_patterns
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
__version__ = '0.13.7'
|
||||
__version__ = '0.15.3'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django
|
||||
import os
|
||||
|
||||
@@ -91,6 +93,15 @@ DATABASES = {
|
||||
'default': database_config.get(database_engine),
|
||||
}
|
||||
|
||||
USE_I18N = True
|
||||
LANGUAGES = (
|
||||
('en', 'English', ),
|
||||
('it', 'Italian', ),
|
||||
)
|
||||
LANGUAGE_CODE = 'en'
|
||||
|
||||
ROOT_URLCONF = 'tests.urls'
|
||||
|
||||
MEDIA_ROOT = os.path.join(BASE_DIR, 'admin_interface/public/media/')
|
||||
MEDIA_URL = '/media/'
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.core.management import call_command
|
||||
from django.test import TestCase
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.test import TestCase
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import ImproperlyConfigured
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django.test import TestCase
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.test import override_settings, TestCase
|
||||
from django.test.client import RequestFactory
|
||||
from django.template import Context, Template
|
||||
|
||||
@@ -20,6 +22,63 @@ class AdminInterfaceTemplateTagsTestCase(TestCase):
|
||||
def __render_template(self, string, context=None):
|
||||
return Template(string).render(Context(context or {}))
|
||||
|
||||
def test_get_admin_interface_languages(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/en/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
expected_languages = [
|
||||
{'code': 'en', 'name': 'English', 'default': True, 'active': True, 'activation_url': '/i18n/setlang/?next=/en/admin/'},
|
||||
{'code': 'it', 'name': 'Italian', 'default': False, 'active': False, 'activation_url': '/i18n/setlang/?next=/it/admin/'}
|
||||
]
|
||||
self.assertEqual(len(languages), len(expected_languages))
|
||||
self.assertEqual(languages[0], expected_languages[0])
|
||||
self.assertEqual(languages[1], expected_languages[1])
|
||||
|
||||
@override_settings(
|
||||
USE_I18N = False,
|
||||
)
|
||||
def test_get_admin_interface_languages_with_i18n_disabled(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/en/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
@override_settings(
|
||||
ROOT_URLCONF = 'tests.urls_without_i18n_patterns',
|
||||
)
|
||||
def test_get_admin_interface_languages_without_i18n_url_patterns(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/en/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
@override_settings(
|
||||
LANGUAGES = (
|
||||
('en', 'English'),
|
||||
),
|
||||
)
|
||||
def test_get_admin_interface_languages_without_multiple_languages(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/en/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
def test_get_admin_interface_languages_without_request(self):
|
||||
context = Context({})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
def test_get_admin_interface_languages_without_language_prefix_in_url(self):
|
||||
context = Context({
|
||||
'request': self.request_factory.get('/admin/'),
|
||||
})
|
||||
languages = templatetags.get_admin_interface_languages(context)
|
||||
self.assertEqual(languages, None)
|
||||
|
||||
def test_get_theme(self):
|
||||
Theme.objects.all().delete()
|
||||
context = Context({})
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django
|
||||
from django.contrib import admin
|
||||
if django.VERSION < (2, 0):
|
||||
from django.conf.urls import include, url as re_path
|
||||
else:
|
||||
from django.urls import include, re_path
|
||||
from django.conf.urls.i18n import i18n_patterns
|
||||
|
||||
|
||||
urlpatterns = []
|
||||
urlpatterns += [
|
||||
re_path(r'^i18n/', include('django.conf.urls.i18n')),
|
||||
]
|
||||
urlpatterns += i18n_patterns(
|
||||
re_path(r'^admin/', admin.site.urls),
|
||||
)
|
||||
@@ -0,0 +1,15 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django
|
||||
from django.contrib import admin
|
||||
if django.VERSION < (2, 0):
|
||||
from django.conf.urls import url as re_path
|
||||
else:
|
||||
from django.urls import re_path
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
re_path(r'^admin/', admin.site.urls),
|
||||
]
|
||||
Reference in New Issue
Block a user