diff --git a/README.md b/README.md index 1cbd6a35..9c2ea972 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A Dockerised django CMS project, ready to deploy on [Divio](https://www.divio.com/) or another Docker-based cloud platform, and run locally in Docker on your own machine. -This version uses Python 3.8 running and the most up-to-date versions of Django 3.1 and django CMS 3.8. +This version uses Python 3.9 running and the most up-to-date versions of Django 3.2 and django CMS 3.11. This project is endorsed by the [django CMS Association](https://www.django-cms.org/en/about-us/). That means that it is officially accepted by the dCA as being in line with our roadmap vision and development/plugin policy. Join us on [Slack](https://www.django-cms.org/slack/) for more information or questions. @@ -19,6 +19,7 @@ You need to have docker installed on your system to run this project. ```bash git clone git@github.com:django-cms/django-cms-quickstart.git +git checkout support/cms-3.11.x cd django-cms-quickstart docker compose build web docker compose up -d database_default @@ -35,7 +36,7 @@ Note: Since Compose V2, `docker-compose` is now included inside docker. For more This project is ready-to-go without making any changes at all, but also gives you some options. -As-is, it will include a number of useful django CMS plugins and Bootstrap 4 for the frontend. You don't have to use +As-is, it will include a number of useful django CMS plugins and Bootstrap 5 for the frontend. You don't have to use these; they're optional. If you don't want to use them, read through the `settings.py` and `requirements.txt` files to see sections that can be removed - in each case, the section is noted with a comment containing the word 'optional'. diff --git a/backend/settings.py b/backend/settings.py index eaf6fb24..19b80d8c 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -56,28 +56,28 @@ # some content plugins - optional, but used in most projects 'djangocms_file', 'djangocms_icon', - 'djangocms_link', 'djangocms_picture', 'djangocms_style', 'djangocms_googlemap', 'djangocms_video', - # optional django CMS Bootstrap 4 modules - 'djangocms_bootstrap4', - 'djangocms_bootstrap4.contrib.bootstrap4_alerts', - 'djangocms_bootstrap4.contrib.bootstrap4_badge', - 'djangocms_bootstrap4.contrib.bootstrap4_card', - 'djangocms_bootstrap4.contrib.bootstrap4_carousel', - 'djangocms_bootstrap4.contrib.bootstrap4_collapse', - 'djangocms_bootstrap4.contrib.bootstrap4_content', - 'djangocms_bootstrap4.contrib.bootstrap4_grid', - 'djangocms_bootstrap4.contrib.bootstrap4_jumbotron', - 'djangocms_bootstrap4.contrib.bootstrap4_link', - 'djangocms_bootstrap4.contrib.bootstrap4_listgroup', - 'djangocms_bootstrap4.contrib.bootstrap4_media', - 'djangocms_bootstrap4.contrib.bootstrap4_picture', - 'djangocms_bootstrap4.contrib.bootstrap4_tabs', - 'djangocms_bootstrap4.contrib.bootstrap4_utilities', + # optional django CMS Frontend modules + 'djangocms_frontend', + 'djangocms_frontend.contrib.accordion', + 'djangocms_frontend.contrib.alert', + 'djangocms_frontend.contrib.badge', + 'djangocms_frontend.contrib.card', + 'djangocms_frontend.contrib.carousel', + 'djangocms_frontend.contrib.collapse', + 'djangocms_frontend.contrib.content', + 'djangocms_frontend.contrib.grid', + 'djangocms_frontend.contrib.jumbotron', + 'djangocms_frontend.contrib.link', + 'djangocms_frontend.contrib.listgroup', + 'djangocms_frontend.contrib.media', + 'djangocms_frontend.contrib.image', + 'djangocms_frontend.contrib.tabs', + 'djangocms_frontend.contrib.utilities', ] MIDDLEWARE = [ @@ -123,14 +123,24 @@ }, ] +THUMBNAIL_PROCESSORS = ( + 'easy_thumbnails.processors.colorspace', + 'easy_thumbnails.processors.autocrop', + #'easy_thumbnails.processors.scale_and_crop', + 'filer.thumbnail_processors.scale_and_crop_with_subject_location', + 'easy_thumbnails.processors.filters', +) + + CMS_TEMPLATES = [ # a minimal template to get started with ('minimal.html', 'Minimal template'), - ('whitenoise-static-files-demo.html', 'Static File Demo'), # optional templates that extend base.html, to be used with Bootstrap 5 - ('page.html', 'Bootstrap 4 Demo'), - ('feature.html', 'Bootstrap 4 Demo with two placeholders') + ('bootstrap5.html', 'Bootstrap 5 Demo'), + + # serving static files with whitenoise demo + ('whitenoise-static-files-demo.html', 'Static File Demo'), ] WSGI_APPLICATION = 'backend.wsgi.application' @@ -144,6 +154,7 @@ DATABASE_URL = os.environ.get('DATABASE_URL', 'sqlite://:memory:') DATABASES = {'default': dj_database_url.parse(DATABASE_URL)} +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' # Password validation # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators diff --git a/backend/templates/base.html b/backend/templates/base.html index f628a2a4..194eaf3a 100644 --- a/backend/templates/base.html +++ b/backend/templates/base.html @@ -1,37 +1,34 @@ -{% load cms_tags static sekizai_tags menu_tags %} - - -
- -