Briq/django-admin-interface
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit '951c07b76d7835b72a4e1f636639ad1219c207b6' into my-merge-progressivo1

Browse Source
This commit is contained in:
Guido Longoni
2023-06-22 11:24:21 +02:00
parent a96cede14f 951c07b76d
commit ae53c43b29
16 changed files with 465 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin_interface/models.py
+11 -44
View File
@@ -172,14 +172,8 @@ class Theme(models.Model):
default=True, verbose_name=_("active")
)
language_chooser_display_choices = (
(
"code",
_("code"),
),
(
"name",
_("name"),
),
("code", _("code")),
("name", _("name")),
)
language_chooser_display = models.CharField(
max_length=10,
@@ -332,42 +326,15 @@ class Theme(models.Model):
verbose_name=_("background color"),
)
related_modal_background_opacity_choices = (
(
"0.1",
"10%",
),
(
"0.2",
"20%",
),
(
"0.3",
"30%",
),
(
"0.4",
"40%",
),
(
"0.5",
"50%",
),
(
"0.6",
"60%",
),
(
"0.7",
"70%",
),
(
"0.8",
"80%",
),
(
"0.9",
"90%",
),
("0.1", "10%"),
("0.2", "20%"),
("0.3", "30%"),
("0.4", "40%"),
("0.5", "50%"),
("0.6", "60%"),
("0.7", "70%"),
("0.8", "80%"),
("0.9", "90%"),
)
related_modal_background_opacity = models.CharField(
max_length=5,
admin_interface/static/admin_interface/magnific-popup/jquery.magnific-popup.js
Vendored
+1 -1
View File
@@ -1507,7 +1507,7 @@
}
},
// Get element postion relative to viewport
// Get element position relative to viewport
_getOffset: function(isLarge) {
var el;
if(isLarge) {
admin_interface/static/admin_interface/related-modal/related-modal.js
+12 -5
View File
@@ -136,23 +136,30 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
window.presentRelatedObjectModalOnClickOn = presentRelatedObjectModalOnClickOn;
// django 1.7 compatibility
// $('a.add-another').removeAttr('onclick').click({ lookup:false }, presentRelatedObjectModal);
presentRelatedObjectModalOnClickOn('a.add-another');
// django 1.8 and above
// $('a.related-widget-wrapper-link').click({ lookup:false }, presentRelatedObjectModal);
presentRelatedObjectModalOnClickOn('a.related-widget-wrapper-link');
// raw_id_fields support
// $('a.related-lookup').unbind('click').click({ lookup:true }, presentRelatedObjectModal);
presentRelatedObjectModalOnClickOn('a.related-lookup', true);
// django-dynamic-raw-id support - #61
// https://github.com/lincolnloop/django-dynamic-raw-id
presentRelatedObjectModalOnClickOn('a.dynamic_raw_id-related-lookup', true);
// show_change_link=True support
presentRelatedObjectModalOnClickOn('a.inlinechangelink');
// django-streamfield support
// https://github.com/raagin/django-streamfield/
presentRelatedObjectModalOnClickOn('.streamfield_app a.stream-btn[href*="_popup=1"]');
// Vanilla js for catching the click during capture phase for anticipating Vue.js listener.
document.addEventListener('click', function(event) {
// console.log('click intercepted before Vue.');
if (event.target.matches('.streamfield_app a.stream-btn[href*="_popup=1"]')) {
event.stopImmediatePropagation();
event.preventDefault();
$(event.target).trigger('click');
}
}, { capture: true });
});
})(django.jQuery);
admin_interface/static/ckeditor/ckeditor/skins/light/skin.js
+1 -1
View File
@@ -49,7 +49,7 @@ CKEDITOR.skin.name = 'husky';
// the complete list:
// http://docs.ckeditor.com/#!/api/CKEDITOR.env
//
// Internet explorer is an expection and the browser version is also accepted
// Internet explorer is an exception and the browser version is also accepted
// (ie7, ie8, ie9, ie10), as well as a special name for IE in Quirks mode (iequirks).
//
// The available browser specific files must be set separately for editor.css
admin_interface/static/streamfield/js/admin_popup_response.js
+22
View File
@@ -0,0 +1,22 @@
(function() {
'use strict';
var windowRef = window;
var openerRef = windowRef.parent;
var initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);
switch (initData.action) {
case 'change':
openerRef.streamapps[initData.app_id].updateBlock(initData.block_id, initData.instance_id);
openerRef.dismissRelatedObjectModal();
break;
case 'delete':
break;
default:
openerRef.streamapps[initData.app_id].updateBlock(initData.block_id, initData.instance_id);
openerRef.dismissRelatedObjectModal();
break;
}
})();
admin_interface/templates/admin/base_site.html
+74
View File
File diff suppressed because one or more lines are too long
admin_interface/templates/admin_interface/css/admin-interface.css
+83 -130
View File
File diff suppressed because one or more lines are too long
admin_interface/templates/admin_interface/css/recent-actions.css
+6 -3
View File
@@ -1,9 +1,12 @@
{% if not theme.recent_actions_visible %}
.admin-interface.dashboard #content {
max-width:600px;
margin-right:0;
width: auto;
max-width: 600px;
margin-right: 0;
margin-left: 0;
}
.admin-interface.dashboard #content #recent-actions-module {
display:none;
display: none;
}
{% endif %}
admin_interface/templates/admin_interface/css/streamfield.css
+200
View File
@@ -0,0 +1,200 @@
/*
django-streamfield support
https://github.com/raagin/django-streamfield/
*/
.admin-interface .form-row.field-stream {
margin: 0;
padding: 0;
border-bottom: none;
}
.admin-interface .form-row.field-stream label[for=id_stream] {
display: none;
}
.admin-interface .streamfield_app {
clear: both;
width: 100%;
}
.admin-interface .streamfield_app .stream-help-text {
margin-bottom: 15px;
display: flex;
flex-direction: column;
clear: both;
}
.admin-interface .streamfield_app .stream-help-text .stream-help-text__title {
align-self: flex-end;
user-select: none;
padding: 8px;
padding-right: 0;
color: var(--admin-interface-generic-link-color);
}
.admin-interface .streamfield_app .stream-help-text .stream-help-text__title:hover {
color: var(--admin-interface-generic-link-hover-color);
}
.admin-interface .streamfield_app .stream-help-text .stream-help-text__content {
background: var(--admin-interface-module-background-selected-color);
border-radius: var(--admin-interface-module-border-radius);
border: 1px solid rgba(0,0,0,0.1);
padding: 15px;
}
.admin-interface .streamfield_app .stream-help-text .stream-help-text__content > ul {
margin: 0;
padding: 0;
}
.admin-interface .streamfield_app .collapse-handler {
user-select: none;
padding: 8px;
padding-right: 0;
margin: 0 0 5px 0;
color: var(--admin-interface-generic-link-color);
text-decoration: none;
}
.admin-interface .streamfield_app .collapse-handler:hover {
color: var(--admin-interface-generic-link-hover-color);
text-decoration: none;
}
.admin-interface .streamfield_app .stream-model-block {
position: relative;
box-shadow: none;
border: 1px solid rgba(0,0,0,0.1);
border-radius: var(--admin-interface-module-border-radius);
overflow: hidden;
}
.admin-interface .streamfield_app .stream-model-block,
.admin-interface .streamfield_app .streamfield-models.collapsed .stream-model-block {
margin-bottom: 10px;
}
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin: 0;
padding: 10px 10px 10px 20px;
}
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title span {
font-size: 18px;
}
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title .streamblock__block-handle {
position: static;
right: 0;
top: 0;
color: var(--admin-interface-generic-link-color);
}
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title .streamblock__block-handle:hover {
color: var(--admin-interface-generic-link-hover-color);
}
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title .streamblock__block-handle {
display: flex;
justify-content: center;
align-items: center;
}
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title .streamblock__block-handle .block-move,
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title .streamblock__block-handle .block-delete {
display: flex;
justify-content: center;
align-items: center;
width: 40px;
height: 40px;
font-weight: normal;
background: none;
flex-shrink: 0;
color: inherit;
font-size: 16px;
}
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title .streamblock__block-handle .block-move {
cursor: move; /* fallback if grab cursor is unsupported */
cursor: grab;
cursor: -moz-grab;
cursor: -webkit-grab;
}
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title .streamblock__block-handle .block-move:before {
content: "↕";
display: block;
}
.admin-interface .streamfield_app .stream-model-block .streamblock__block__title .streamblock__block-handle .block-delete:before {
content: "×";
display: block;
font-size: 18px;
}
.admin-interface .streamfield_app .block-fields > div {
margin-bottom: 15px;
}
.admin-interface .streamfield_app .stream-model-block .stream-model-block__content {
background-color: #f8f8f8;
padding: 20px;
}
.admin-interface .streamfield_app .stream-model-block .stream-model-block__content.no-subblocks.abstract-block {
display: none;
}
.admin-interface .streamfield_app .stream-insert-new-block {
margin-bottom: 20px;
}
.admin-interface .streamfield_app .stream-insert-new-block .add-new-block-button {
color: var(--admin-interface-generic-link-color);
text-decoration: none;
}
.admin-interface .streamfield_app .stream-insert-new-block .add-new-block-button:hover {
color: var(--admin-interface-generic-link-hover-color);
text-decoration: none;
}
.admin-interface .streamfield_app .stream-insert-new-block ul {
display: block;
width: 100%;
margin: 10px 0 0 0;
padding: 0;
user-select: none;
}
.admin-interface .streamfield_app .stream-insert-new-block ul li {
display: inline-block;
font-size: 12px;
margin: 0;
padding: 0;
}
.admin-interface .streamfield_app .stream-btn {
font-weight: normal;
text-decoration: none;
background-color: var(--admin-interface-generic-link-color);
padding: 6px 12px;
border-radius: 4px;
}
.admin-interface .streamfield_app .stream-btn:hover {
text-decoration: none;
background-color: var(--admin-interface-generic-link-hover-color);
}
.admin-interface .streamfield_app .stream-insert-new-block ul li .stream-btn {
margin-top: 5px;
margin-left: 5px;
}
admin_interface/templatetags/admin_interface_tags.py
+3 -3
View File
@@ -80,9 +80,9 @@ def get_admin_interface_version():
def hash_string(text):
hash_object = hashlib.md5(text.encode())
md5_hash = hash_object.hexdigest()
return md5_hash
hash_object = hashlib.sha224(text.encode())
sha224_hash = hash_object.hexdigest()
return sha224_hash
@simple_tag(takes_context=False)
admin_interface/version.py
+1 -1
View File
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
__version__ = "0.19.3"
__version__ = "0.20.0"