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 = ( LANGUAGES = (
("en", _("English")), ("en", _("English")),
("it", _("Italiano")), ("it", _("Italiano")),
("fr", _("Française")), ("fr", _("Français")),
# more than one language is expected here # more than one language is expected here
) )
LANGUAGE_CODE = "en" LANGUAGE_CODE = "en"

View File

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

View File

@ -10,7 +10,7 @@
{% get_admin_interface_theme as theme %} {% get_admin_interface_theme as theme %}
{% get_admin_interface_nocache as version_md5_cache %} {% get_admin_interface_nocache as version_md5_cache %}
{% get_current_language as current_lang %} {% get_current_language as current_lang %}
<style type="text/css"> <style type="text/css">
:root .admin-interface { :root .admin-interface {
--admin-interface-title-color: {{ theme.title_color }}; --admin-interface-title-color: {{ theme.title_color }};
--admin-interface-logo-color: {{ theme.logo_color }}; --admin-interface-logo-color: {{ theme.logo_color }};
@ -19,7 +19,7 @@
--admin-interface-header-background-color: {{ theme.css_header_background_color }}; --admin-interface-header-background-color: {{ theme.css_header_background_color }};
--admin-interface-header-text-color: {{ theme.css_header_text_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-color: {{ theme.css_header_link_color }};
--admin-interface-header-link_hover-color: {{ theme.css_header_link_hover_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-background-color: {{ theme.css_module_background_color }};
--admin-interface-module-background-selected-color: {{ theme.css_module_background_selected_color }}; --admin-interface-module-background-selected-color: {{ theme.css_module_background_selected_color }};
--admin-interface-module-text-color: {{ theme.css_module_text_color }}; --admin-interface-module-text-color: {{ theme.css_module_text_color }};
@ -80,6 +80,7 @@
{% include "admin_interface/css/admin-interface.css" %} {% include "admin_interface/css/admin-interface.css" %}
{% include "admin_interface/css/admin-interface-fix.css" %} {% include "admin_interface/css/admin-interface-fix.css" %}
{% include "admin_interface/css/form-controls.css" %} {% include "admin_interface/css/form-controls.css" %}
{% include "admin_interface/css/language-chooser.css" %}
{% include "admin_interface/css/list-filter-dropdown.css" %} {% include "admin_interface/css/list-filter-dropdown.css" %}
{% include "admin_interface/css/recent-actions.css" %} {% include "admin_interface/css/recent-actions.css" %}
{% include "admin_interface/css/related-modal.css" %} {% include "admin_interface/css/related-modal.css" %}

View File

@ -137,7 +137,7 @@
.admin-interface #header #user-tools a:hover, .admin-interface #header #user-tools a:hover,
.admin-interface #header #user-tools a:active { .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); border-bottom-color: rgba(255, 255, 255, 0.5);
} }
@ -347,9 +347,17 @@
@media (min-width: 768px) { @media (min-width: 768px) {
.admin-interface.list-filter-sticky .module.filtered #changelist-filter { .admin-interface.list-filter-sticky .module.filtered #changelist-filter {
position: sticky; position: sticky;
top: 40px; top: 30px;
float: right; float: right;
z-index: 30; 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 */ /* feature not available for django < 3.1.2 */
@ -357,12 +365,15 @@
position: absolute; position: absolute;
top: 0px; top: 0px;
z-index: 30; 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 { .admin-interface .module.filtered #changelist-filter {
border-bottom-left-radius: var(--admin-interface-module-border-radius); border-radius: var(--admin-interface-module-border-radius);
border-bottom-right-radius: var(--admin-interface-module-border-radius);
} }
.admin-interface .module.filtered #changelist-filter #changelist-filter-clear a:focus, .admin-interface .module.filtered #changelist-filter #changelist-filter-clear a:focus,

View File

@ -16,7 +16,7 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
border-radius: 0; border-radius: 0;
border-top: 1px solid #EEEEEE; border-top: 1px solid #EEEEEE !important;
border-bottom: none; border-bottom: none;
margin: 0; 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 { .admin-interface .list-filter-dropdown {
margin-top:10px; margin-top: 0;
margin-bottom:20px; margin-bottom: 20px;
}
.admin-interface .list-filter-dropdown h3 {
margin-top: 0;
} }
.admin-interface .list-filter-dropdown select { .admin-interface .list-filter-dropdown select {