Skip to content

Commit 6979824

Browse files
author
Mario Colombo
committed
revert to bs4 (as bs5 is still a bit broken)
1 parent 965842a commit 6979824

File tree

4 files changed

+44
-42
lines changed

4 files changed

+44
-42
lines changed

‎backend/settings.py

Lines changed: 18 additions & 18 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 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',
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',
8181
]
8282

8383
MIDDLEWARE = [
@@ -129,8 +129,8 @@
129129
('whitenoise-static-files-demo.html', 'Static File Demo'),
130130

131131
# 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')
132+
('page.html', 'Bootstrap 4 Demo'),
133+
('feature.html', 'Bootstrap 4 Demo with two placeholders')
134134
]
135135

136136
WSGI_APPLICATION = 'backend.wsgi.application'

‎backend/templates/base.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
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 href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
8+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
9+
<!-- <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> -->
910
{% render_block "css" %}
1011
</head>
1112
<body>
@@ -26,8 +27,11 @@
2627
</div>
2728
{% block content %}{% endblock content %}
2829
</div>
30+
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
2931
<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>
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>
32+
33+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
34+
<!-- <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> -->
3135
{% render_block "js" %}
3236
</body>
3337
</html>

‎requirements.in

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Compile this file for changes to take effect:
2+
# pip-compile requirements.in >> requirements.txt
3+
4+
15
django>=3.1,<3.2 # 3.2 has dark admin theme which looks bad in custom django CMS admin views
26
dj-database-url==0.5.0
37
django-storage-url==0.5.0
@@ -30,8 +34,14 @@ djangocms-video>=3.0,<4.0
3034
djangocms-file>=3.0,<4.0
3135
djangocms-picture>=3.0,<4.0
3236

37+
38+
# optional django CMS Bootstrap 4 modules
39+
djangocms-bootstrap4>=2.0,<3.0
3340
# 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
41+
# as of Q4 2021 there are still basic issues with djangocms-bootstrap5
42+
# https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5
3543

3644
# Django Filer - optional, but used in most projects (alpha)
3745
https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip#egg=django-filer
46+
47+
pip-tools # needed for compilation of this file into requirements.txt, see start of file

‎requirements.txt

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ django==3.1.13
2121
# -r requirements.in
2222
# django-classy-tags
2323
# django-cms
24-
# django-filer
2524
# django-formtools
26-
# django-polymorphic
2725
# django-sekizai
2826
# django-storages
2927
# django-treebeard
@@ -37,7 +35,7 @@ django-cms==3.9.0
3735
# via
3836
# -r requirements.in
3937
# djangocms-attributes-field
40-
# djangocms-bootstrap5
38+
# djangocms-bootstrap4
4139
# djangocms-file
4240
# djangocms-googlemap
4341
# djangocms-icon
@@ -49,20 +47,14 @@ django-cms==3.9.0
4947
django-filer @ https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip
5048
# via
5149
# -r requirements.in
52-
# djangocms-bootstrap5
50+
# djangocms-bootstrap4
5351
# djangocms-file
5452
# djangocms-googlemap
5553
# djangocms-link
5654
# djangocms-picture
5755
# djangocms-video
5856
django-formtools==2.3
5957
# via django-cms
60-
django-js-asset==1.2.2
61-
# via django-mptt
62-
django-mptt==0.13.4
63-
# via django-filer
64-
django-polymorphic==3.0.0
65-
# via django-filer
6658
django-sekizai==2.0.0
6759
# via
6860
# -r requirements.in
@@ -79,14 +71,14 @@ djangocms-admin-style==2.0.2
7971
# django-cms
8072
djangocms-attributes-field==2.0.0
8173
# via
82-
# djangocms-bootstrap5
74+
# djangocms-bootstrap4
8375
# djangocms-file
8476
# djangocms-icon
8577
# djangocms-link
8678
# djangocms-picture
8779
# djangocms-style
8880
# djangocms-video
89-
djangocms-bootstrap5 @ https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip
81+
djangocms-bootstrap4==2.0.0
9082
# via -r requirements.in
9183
djangocms-file==3.0.0
9284
# via -r requirements.in
@@ -95,29 +87,27 @@ djangocms-googlemap==2.0.0
9587
djangocms-icon==2.0.0
9688
# via
9789
# -r requirements.in
98-
# djangocms-bootstrap5
90+
# djangocms-bootstrap4
9991
djangocms-link==3.0.0
10092
# via
10193
# -r requirements.in
102-
# djangocms-bootstrap5
94+
# djangocms-bootstrap4
10395
djangocms-picture==3.0.0
10496
# via
10597
# -r requirements.in
106-
# djangocms-bootstrap5
98+
# djangocms-bootstrap4
10799
djangocms-style==3.0.0
108100
# via -r requirements.in
109101
djangocms-text-ckeditor==4.0.0
110102
# via
111103
# -r requirements.in
112-
# djangocms-bootstrap5
104+
# djangocms-bootstrap4
113105
djangocms-video==3.0.0
114106
# via -r requirements.in
115107
docutils==0.15.2
116108
# via botocore
117109
easy-thumbnails==2.8rc0
118-
# via
119-
# django-filer
120-
# djangocms-picture
110+
# via djangocms-picture
121111
furl==2.1.3
122112
# via django-storage-url
123113
html5lib==1.1
@@ -164,8 +154,6 @@ tinycss2==1.1.0
164154
# via
165155
# cssselect2
166156
# svglib
167-
unidecode==1.1.2
168-
# via django-filer
169157
urllib3==1.25.11
170158
# via botocore
171159
uwsgi==2.0.19.1

0 commit comments

Comments
 (0)