Skip to content
Snippets Groups Projects
Commit aba55d40 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

add inline fieldsets, universal admin dropdown css

parent a157bada
No related branches found
No related tags found
No related merge requests found
...@@ -98,17 +98,17 @@ class ContractAdmin(MarkdownxGuardedModelAdmin): ...@@ -98,17 +98,17 @@ class ContractAdmin(MarkdownxGuardedModelAdmin):
ContractSigneeRepresentativeInline, ContractSigneeRepresentativeInline,
) )
def __init__(self, *args, **kwargs): #def __init__(self, *args, **kwargs):
from .models import Contract #from .models import Contract
super().__init__(*args, **kwargs) #super().__init__(*args, **kwargs)
if hasattr(self, "instance"): #if hasattr(self, "instance"):
self.fields["contractee_representatives"].queryset = ( #self.fields["contractee_representatives"].queryset = (
Contract #Contract
.objects #.objects
.filter(contract=self.instance) #.filter(contract=self.instance)
) #)
def get_fieldsets(self, request, obj=None): def get_fieldsets(self, request, obj=None):
fieldsets = [ fieldsets = [
...@@ -277,6 +277,7 @@ for model in ( ...@@ -277,6 +277,7 @@ for model in (
admin.site.register(ContractFile, ContractFileAdmin) admin.site.register(ContractFile, ContractFileAdmin)
for model in ( for model in (
Contractee,
ContractIssue, ContractIssue,
ContractFilingArea, ContractFilingArea,
): ):
......
...@@ -56,6 +56,7 @@ INSTALLED_APPS = [ ...@@ -56,6 +56,7 @@ INSTALLED_APPS = [
"django.contrib.sessions", "django.contrib.sessions",
"django.contrib.messages", "django.contrib.messages",
"django.contrib.staticfiles", "django.contrib.staticfiles",
"fieldsets_with_inlines",
"import_export", "import_export",
"rangefilter", "rangefilter",
"guardian", "guardian",
......
...@@ -2,15 +2,55 @@ ...@@ -2,15 +2,55 @@
{% block extrastyle %}{{ block.super }} {% block extrastyle %}{{ block.super }}
<style> <style>
:root { :root, :root .admin-interface {
--djai-tab-bg: #000 !important; --djai-tab-bg: var(--admin-interface-header-background-color);
--djai-tab-bg--active: #424242 !important; --djai-tab-fg: var(--admin-interface-header-text-color);
--djai-tab-bg--hover: #424242 !important;
--djai-dropdown-bg: #424242 !important; --djai-tab-bg--active: var(--djai-tab-fg);
--djai-dropdown-bg--active: #5e5e5e !important; --djai-tab-bg--hover: var(--djai-tab-fg);
--djai-dropdown-bg--hover: #5e5e5e !important; --djai-tab-fg--active: var(--djai-tab-bg);
--djai-tab-fg--hover: var(--djai-tab-bg);
--djai-dropdown-bg: var(--djai-tab-bg);
--djai-dropdown-fg: var(--djai-tab-fg);
--djai-dropdown-bg--active: var(--djai-tab-fg);
--djai-dropdown-bg--hover: var(--djai-tab-fg);
--djai-dropdown-fg--active: var(--djai-tab-bg);
--djai-dropdown-fg--hover: var(--djai-tab-bg);
} }
.djai-dropdown-menu .djai-dropdown-menu__drop {
box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.1), -2px 2px 3px rgba(0, 0, 0, 0.1) !important;
}
.djai-dropdown-menu a.djai-dropdown-menu__item:hover {
color: var(--djai-tab-fg--hover) !important;
}
.djai-dropdown-menu a.djai-dropdown-menu__item.djai-dropdown-menu__item--active {
color: var(--djai-tab-fg--active) !important;
}
.djai-dropdown-menu .djai-dropdown-menu__drop-item--active a {
color: var(--djai-tab-fg--active) !important;
}
#header .djai-dropdown-menu .djai-dropdown-menu__drop-item {
transition: .15s;
}
#header .djai-dropdown-menu .djai-dropdown-menu__drop-item a {
color: var(--djai-dropdown-fg);
}
#header .djai-dropdown-menu .djai-dropdown-menu__drop-item a:hover {
color: var(--djai-dropdown-fg--hover) !important;
text-decoration: none;
}
.index-action-buttons { .index-action-buttons {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
......
...@@ -5,6 +5,7 @@ django-admin-interface==0.24.2 ...@@ -5,6 +5,7 @@ django-admin-interface==0.24.2
django-admin-rangefilter==0.9.0 django-admin-rangefilter==0.9.0
django-autocomplete-light==3.9.4 django-autocomplete-light==3.9.4
django-database-url==1.0.3 django-database-url==1.0.3
django-fieldsets-with-inlines==0.6
django-import-export==3.1.0 django-import-export==3.1.0
djhacker==0.2.3 djhacker==0.2.3
django-ordered-model==3.7.1 django-ordered-model==3.7.1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment