Skip to content

WiP: Experimental Stuff #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 24, 2021
Merged

WiP: Experimental Stuff #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions backend/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,22 @@
'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 Bootstrap 5 modules
'djangocms_bootstrap5',
'djangocms_bootstrap5.contrib.bootstrap5_alerts',
'djangocms_bootstrap5.contrib.bootstrap5_badge',
'djangocms_bootstrap5.contrib.bootstrap5_card',
'djangocms_bootstrap5.contrib.bootstrap5_carousel',
'djangocms_bootstrap5.contrib.bootstrap5_collapse',
'djangocms_bootstrap5.contrib.bootstrap5_content',
'djangocms_bootstrap5.contrib.bootstrap5_grid',
'djangocms_bootstrap5.contrib.bootstrap5_jumbotron',
'djangocms_bootstrap5.contrib.bootstrap5_link',
'djangocms_bootstrap5.contrib.bootstrap5_listgroup',
'djangocms_bootstrap5.contrib.bootstrap5_media',
'djangocms_bootstrap5.contrib.bootstrap5_picture',
'djangocms_bootstrap5.contrib.bootstrap5_tabs',
'djangocms_bootstrap5.contrib.bootstrap5_utilities',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -128,9 +128,9 @@
('minimal.html', 'Minimal template'),
('whitenoise-static-files-demo.html', 'Static File Demo'),

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

WSGI_APPLICATION = 'backend.wsgi.application'
Expand Down
5 changes: 2 additions & 3 deletions backend/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="utf-8">
<title>{% block title %}This is my new project home page{% endblock title %}</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
{% render_block "css" %}
</head>
<body>
Expand All @@ -26,9 +26,8 @@
</div>
{% block content %}{% endblock content %}
</div>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<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>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<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>
{% render_block "js" %}
</body>
</html>
13 changes: 4 additions & 9 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,8 @@ djangocms-video>=3.0,<4.0
djangocms-file>=3.0,<4.0
djangocms-picture>=3.0,<4.0

# optional django CMS Bootstrap 4 modules
djangocms-bootstrap4>=2.0,<3.0

# Django Filer - optional, but used in most projects
easy_thumbnails
django-filer>=1.3
django-mptt>0.9
html5lib>=1.0.1
Pillow>=3.0
# optional django CMS Bootstrap 5 modules (alpha) - requires BS5 frontend setup in the templates
https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5

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