diff --git a/python/cac_tripplanner/cac_tripplanner/settings.py b/python/cac_tripplanner/cac_tripplanner/settings.py index 658521e54..0b773e26f 100644 --- a/python/cac_tripplanner/cac_tripplanner/settings.py +++ b/python/cac_tripplanner/cac_tripplanner/settings.py @@ -187,7 +187,9 @@ STATIC_URL = "/static/" STATIC_ROOT = "/srv/cac" -STATICFILES_DIRS = () +STATICFILES_DIRS = [ + os.path.join(BASE_DIR, 'static/'), +] MEDIA_ROOT = "/media/cac/" MEDIA_URL = "/media/" @@ -312,6 +314,7 @@ "top": "wpadmin.menu.menus.BasicTopMenu", "left": "wpadmin.menu.menus.BasicLeftMenu", }, + 'custom_style': STATIC_URL + 'admin/css/pagination.css', } } diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt index b3bb2eb54..77b81088c 100644 --- a/python/cac_tripplanner/requirements.txt +++ b/python/cac_tripplanner/requirements.txt @@ -1,12 +1,12 @@ base58==2.0.1 boto3==1.15.9 boto==2.49.0 -Django==4.0.1 +Django==4.2.11 django-ckeditor==6.0.0 django-image-cropping==1.7.0 django-extensions==3.1.5 django-storages==1.10.1 -easy-thumbnails==2.8.1 +easy-thumbnails==2.8.5 gunicorn==20.0.4 lxml==4.9.2 Pillow==7.2.0 diff --git a/python/cac_tripplanner/static/admin/css/pagination.css b/python/cac_tripplanner/static/admin/css/pagination.css new file mode 100644 index 000000000..c94ea7361 --- /dev/null +++ b/python/cac_tripplanner/static/admin/css/pagination.css @@ -0,0 +1,3 @@ +#change-history > p.paginator { + width: auto; +} diff --git a/python/cac_tripplanner/templates/admin/base.html b/python/cac_tripplanner/templates/admin/base.html index f194f8aa4..9241608cd 100644 --- a/python/cac_tripplanner/templates/admin/base.html +++ b/python/cac_tripplanner/templates/admin/base.html @@ -1,4 +1,19 @@ {% extends "admin/base.html" %} +{% load i18n %} +{% block breadcrumbs %} + {% if title != 'Site administration' %} +
+ {% endif %} +{% endblock %} {% load cropping thumbnail %} {% block extrahead %} {{ form.media }}