Skip to content

Commit 92d32a6

Browse files
author
Mario Colombo
authored
Merge pull request #8 from django-cms/develop
bootstrap 5 and django-filer 2.1 RC4
2 parents a22bcc7 + 50f5beb commit 92d32a6

File tree

3 files changed

+25
-31
lines changed

3 files changed

+25
-31
lines changed

‎backend/settings.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,22 @@
6262
'djangocms_googlemap',
6363
'djangocms_video',
6464

65-
# optional django CMS Bootstrap 4 modules
66-
'djangocms_bootstrap4',
67-
'djangocms_bootstrap4.contrib.bootstrap4_alerts',
68-
'djangocms_bootstrap4.contrib.bootstrap4_badge',
69-
'djangocms_bootstrap4.contrib.bootstrap4_card',
70-
'djangocms_bootstrap4.contrib.bootstrap4_carousel',
71-
'djangocms_bootstrap4.contrib.bootstrap4_collapse',
72-
'djangocms_bootstrap4.contrib.bootstrap4_content',
73-
'djangocms_bootstrap4.contrib.bootstrap4_grid',
74-
'djangocms_bootstrap4.contrib.bootstrap4_jumbotron',
75-
'djangocms_bootstrap4.contrib.bootstrap4_link',
76-
'djangocms_bootstrap4.contrib.bootstrap4_listgroup',
77-
'djangocms_bootstrap4.contrib.bootstrap4_media',
78-
'djangocms_bootstrap4.contrib.bootstrap4_picture',
79-
'djangocms_bootstrap4.contrib.bootstrap4_tabs',
80-
'djangocms_bootstrap4.contrib.bootstrap4_utilities',
65+
# optional django CMS Bootstrap 5 modules
66+
'djangocms_bootstrap5',
67+
'djangocms_bootstrap5.contrib.bootstrap5_alerts',
68+
'djangocms_bootstrap5.contrib.bootstrap5_badge',
69+
'djangocms_bootstrap5.contrib.bootstrap5_card',
70+
'djangocms_bootstrap5.contrib.bootstrap5_carousel',
71+
'djangocms_bootstrap5.contrib.bootstrap5_collapse',
72+
'djangocms_bootstrap5.contrib.bootstrap5_content',
73+
'djangocms_bootstrap5.contrib.bootstrap5_grid',
74+
'djangocms_bootstrap5.contrib.bootstrap5_jumbotron',
75+
'djangocms_bootstrap5.contrib.bootstrap5_link',
76+
'djangocms_bootstrap5.contrib.bootstrap5_listgroup',
77+
'djangocms_bootstrap5.contrib.bootstrap5_media',
78+
'djangocms_bootstrap5.contrib.bootstrap5_picture',
79+
'djangocms_bootstrap5.contrib.bootstrap5_tabs',
80+
'djangocms_bootstrap5.contrib.bootstrap5_utilities',
8181
]
8282

8383
MIDDLEWARE = [
@@ -128,9 +128,9 @@
128128
('minimal.html', 'Minimal template'),
129129
('whitenoise-static-files-demo.html', 'Static File Demo'),
130130

131-
# optional templates that extend base.html, to be used with Bootstrap 4
132-
('page.html', 'Page'),
133-
('feature.html', 'Page with Feature')
131+
# optional templates that extend base.html, to be used with Bootstrap 5
132+
('page.html', 'Bootstrap5 Demo'),
133+
('feature.html', 'Bootstrap5 Demo with two placeholders')
134134
]
135135

136136
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: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,8 @@ djangocms-video>=3.0,<4.0
3030
djangocms-file>=3.0,<4.0
3131
djangocms-picture>=3.0,<4.0
3232

33-
# optional django CMS Bootstrap 4 modules
34-
djangocms-bootstrap4>=2.0,<3.0
35-
36-
# Django Filer - optional, but used in most projects
37-
easy_thumbnails
38-
django-filer>=1.3
39-
django-mptt>0.9
40-
html5lib>=1.0.1
41-
Pillow>=3.0
33+
# optional django CMS Bootstrap 5 modules (alpha) - requires BS5 frontend setup in the templates
34+
https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5
4235

36+
# Django Filer - optional, but used in most projects (alpha)
37+
https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip#egg=django-filer

0 commit comments

Comments
 (0)