Merge commit '8d3d7c9648c58c7c5d0cc219bae2ef6fa43abd8b' into my-merge-progressivo1

my-merge-progressivo1
Guido Longoni 2023-06-22 11:47:41 +02:00
commit 98eefe2877
7 changed files with 83 additions and 35 deletions

View File

@ -176,7 +176,7 @@ You must configure multilanguage `settings` and `urls` correctly:
LANGUAGES = (
("en", _("English")),
("it", _("Italiano")),
("fr", _("Française")),
("fr", _("Français")),
# more than one language is expected here
)
LANGUAGE_CODE = "en"

View File

@ -3,6 +3,7 @@
'use strict';
var windowRef = window;
var windowRefProxy;
var windowName, widgetName;
var openerRef = windowRef.opener;
if (!openerRef) {
@ -14,12 +15,14 @@
// django < 3.1 compatibility
widgetName = openerRef.id_to_windowname(widgetName);
}
windowRef = {
windowRefProxy = {
name: widgetName,
location: windowRef.location,
close: function() {
openerRef.dismissRelatedObjectModal();
}
};
windowRef = windowRefProxy;
}
// default django popup_response.js

File diff suppressed because one or more lines are too long

View File

@ -137,7 +137,7 @@
.admin-interface #header #user-tools a:hover,
.admin-interface #header #user-tools a:active {
color: var(--admin-interface-header-link_hover-color);
color: var(--admin-interface-header-link-hover-color);
border-bottom-color: rgba(255, 255, 255, 0.5);
}
@ -347,9 +347,17 @@
@media (min-width: 768px) {
.admin-interface.list-filter-sticky .module.filtered #changelist-filter {
position: sticky;
top: 40px;
top: 30px;
float: right;
z-index: 30;
display: flex;
flex-direction: column;
overflow-y: auto;
height: 100%;
max-height: calc(100vh - 60px);
}
.admin-interface.list-filter-sticky.sticky-pagination .module.filtered #changelist-filter {
max-height: calc(100vh - 125px);
}
/* feature not available for django < 3.1.2 */
@ -357,12 +365,15 @@
position: absolute;
top: 0px;
z-index: 30;
max-height: calc(100vh - 105px);
}
.admin-interface.list-filter-sticky.sticky-pagination .module.filtered #toolbar + #changelist-filter {
max-height: calc(100vh - 170px);
}
}
.admin-interface .module.filtered #changelist-filter {
border-bottom-left-radius: var(--admin-interface-module-border-radius);
border-bottom-right-radius: var(--admin-interface-module-border-radius);
border-radius: var(--admin-interface-module-border-radius);
}
.admin-interface .module.filtered #changelist-filter #changelist-filter-clear a:focus,

View File

@ -16,7 +16,7 @@
white-space: nowrap;
text-overflow: ellipsis;
border-radius: 0;
border-top: 1px solid #EEEEEE;
border-top: 1px solid #EEEEEE !important;
border-bottom: none;
margin: 0;
}

View File

@ -0,0 +1,29 @@
.admin-interface .language-chooser {
display: inline-block;
position: absolute;
top: 15px;
right: 15px;
z-index: 10;
}
@media (min-width: 768px) {
.admin-interface .language-chooser {
right: 30px;
}
}
@media (min-width: 1024px) {
.admin-interface .language-chooser {
position: static;
float: right;
margin-left: 20px;
}
}
.admin-interface .language-chooser-hidden-form {
display: none;
}
.admin-interface .language-chooser-select-form {
display: inline-block;
}

View File

@ -3,8 +3,12 @@ list-filter-dropdown
*/
.admin-interface .list-filter-dropdown {
margin-top:10px;
margin-bottom:20px;
margin-top: 0;
margin-bottom: 20px;
}
.admin-interface .list-filter-dropdown h3 {
margin-top: 0;
}
.admin-interface .list-filter-dropdown select {