diff --git a/ram/consist/admin.py b/ram/consist/admin.py index 679caa6..451f0d6 100644 --- a/ram/consist/admin.py +++ b/ram/consist/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from adminsortable2.admin import SortableInlineAdminMixin +from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin from consist.models import Consist, ConsistItem @@ -12,7 +12,7 @@ class ConsistItemInline(SortableInlineAdminMixin, admin.TabularInline): @admin.register(Consist) -class ConsistAdmin(admin.ModelAdmin): +class ConsistAdmin(SortableAdminBase, admin.ModelAdmin): inlines = (ConsistItemInline,) readonly_fields = ( "creation_time", diff --git a/ram/portal/static/css/main.css b/ram/portal/static/css/main.css index 9abd996..f497996 100644 --- a/ram/portal/static/css/main.css +++ b/ram/portal/static/css/main.css @@ -6,6 +6,14 @@ display: inline-block; } +.tab-pane { + min-height: 300px; +} + +#nav-notes > p { + padding: .5rem; +} + #footer > p { display: inline; } diff --git a/ram/portal/templates/flatpage.html b/ram/portal/templates/flatpage.html deleted file mode 100644 index 057dc02..0000000 --- a/ram/portal/templates/flatpage.html +++ /dev/null @@ -1,75 +0,0 @@ -{% load static %} -{% load breadcrumbs %} -{% load solo_tags %} -{% get_solo 'portal.SiteConfiguration' as site_conf %} - - - - - - - - - - - - - - - {{ site_conf.site_name }} - {{ page.name }} - - - - - - {% if site_conf.common_css %}{% endif %} - - - -
-
- {% include 'navbar.html' %} - -
-
-
-
-
- {{ content }} -
-
-
- - {% include 'footer.html' %} - - - - - - - diff --git a/ram/portal/templates/footer.html b/ram/portal/templates/footer.html index 67cdc67..18301f1 100644 --- a/ram/portal/templates/footer.html +++ b/ram/portal/templates/footer.html @@ -1,6 +1,6 @@ {% load markdown %} -