Skip to content

Commit 7191608

Browse files
author
Mario Colombo
authored
Merge pull request #14 from django-cms/update-v4
backport
2 parents 9ef676d + 995babf commit 7191608

File tree

4 files changed

+29
-32
lines changed

4 files changed

+29
-32
lines changed

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ You need to have docker installed on your system to run this project.
1818
```bash
1919
git clone git@github.com:django-cms/django-cms-quickstart.git
2020
cd django-cms-quickstart
21-
docker compose up --force-recreate --build -d
21+
docker compose build web
22+
docker compose up -d database_default
2223
docker compose run web python manage.py migrate
2324
docker compose run web python manage.py createsuperuser
25+
docker compose up -d
2426
```
2527

2628
Then open http://django-cms-quickstart.127.0.0.1.nip.io:8000 (or just http://127.0.0.1:8000) in your browser.

‎backend/settings.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,22 @@
6969
'djangocms_googlemap',
7070
'djangocms_video',
7171

72-
# optional django CMS Bootstrap 4 modules
73-
'djangocms_bootstrap4',
74-
'djangocms_bootstrap4.contrib.bootstrap4_alerts',
75-
'djangocms_bootstrap4.contrib.bootstrap4_badge',
76-
'djangocms_bootstrap4.contrib.bootstrap4_card',
77-
'djangocms_bootstrap4.contrib.bootstrap4_carousel',
78-
'djangocms_bootstrap4.contrib.bootstrap4_collapse',
79-
'djangocms_bootstrap4.contrib.bootstrap4_content',
80-
'djangocms_bootstrap4.contrib.bootstrap4_grid',
81-
'djangocms_bootstrap4.contrib.bootstrap4_jumbotron',
82-
'djangocms_bootstrap4.contrib.bootstrap4_link',
83-
'djangocms_bootstrap4.contrib.bootstrap4_listgroup',
84-
'djangocms_bootstrap4.contrib.bootstrap4_media',
85-
'djangocms_bootstrap4.contrib.bootstrap4_picture',
86-
'djangocms_bootstrap4.contrib.bootstrap4_tabs',
87-
'djangocms_bootstrap4.contrib.bootstrap4_utilities',
72+
# optional django CMS Bootstrap 5 modules
73+
'djangocms_bootstrap5',
74+
'djangocms_bootstrap5.contrib.bootstrap5_alerts',
75+
'djangocms_bootstrap5.contrib.bootstrap5_badge',
76+
'djangocms_bootstrap5.contrib.bootstrap5_card',
77+
'djangocms_bootstrap5.contrib.bootstrap5_carousel',
78+
'djangocms_bootstrap5.contrib.bootstrap5_collapse',
79+
'djangocms_bootstrap5.contrib.bootstrap5_content',
80+
'djangocms_bootstrap5.contrib.bootstrap5_grid',
81+
'djangocms_bootstrap5.contrib.bootstrap5_jumbotron',
82+
'djangocms_bootstrap5.contrib.bootstrap5_link',
83+
'djangocms_bootstrap5.contrib.bootstrap5_listgroup',
84+
'djangocms_bootstrap5.contrib.bootstrap5_media',
85+
'djangocms_bootstrap5.contrib.bootstrap5_picture',
86+
'djangocms_bootstrap5.contrib.bootstrap5_tabs',
87+
'djangocms_bootstrap5.contrib.bootstrap5_utilities',
8888
]
8989

9090
MIDDLEWARE = [
@@ -135,9 +135,9 @@
135135
('minimal.html', 'Minimal template'),
136136
('whitenoise-static-files-demo.html', 'Static File Demo'),
137137

138-
# optional templates that extend base.html, to be used with Bootstrap 4
139-
('page.html', 'Page'),
140-
('feature.html', 'Page with Feature')
138+
# optional templates that extend base.html, to be used with Bootstrap 5
139+
('page.html', 'Bootstrap5 Demo'),
140+
('feature.html', 'Bootstrap5 Demo with two placeholders')
141141
]
142142

143143
WSGI_APPLICATION = 'backend.wsgi.application'

‎backend/templates/base.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta charset="utf-8">
66
<title>{% block title %}This is my new project home page{% endblock title %}</title>
77
<meta name="viewport" content="width=device-width,initial-scale=1">
8-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
8+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
99
{% render_block "css" %}
1010
</head>
1111
<body>
@@ -26,9 +26,8 @@
2626
</div>
2727
{% block content %}{% endblock content %}
2828
</div>
29-
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
3029
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
31-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
30+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
3231
{% render_block "js" %}
3332
</body>
3433
</html>

‎requirements.txt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,11 @@ djangocms-video>=3.0,<4.0
3434
djangocms-file>=3.0,<4.0
3535
djangocms-picture>=3.0,<4.0
3636

37-
# optional django CMS Bootstrap 4 modules
38-
https://github.com/Aiky30/djangocms-bootstrap4/tarball/feature/cms-4-support#egg=djangocms-bootstrap4
39-
40-
# Django Filer - optional, but used in most projects
41-
easy_thumbnails
42-
django-filer>=1.3
43-
django-mptt>0.9
44-
html5lib>=1.0.1
45-
Pillow>=3.0
37+
# optional django CMS Bootstrap 5 modules (alpha) - requires BS5 frontend setup in the templates
38+
https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5
39+
40+
# Django Filer - optional, but used in most projects (alpha)
41+
https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip#egg=django-filer
4642

4743
# FIXME: Requires an "official" V1 release
4844
https://github.com/divio/djangocms-versioning/tarball/master#egg=djangocms-versioning

0 commit comments

Comments
 (0)