Skip to content

Commit

Permalink
Upgrade Bootstrap from version 3 to 5.
Browse files Browse the repository at this point in the history
  • Loading branch information
sayravai committed Feb 6, 2025
1 parent f224e87 commit 7867bc4
Show file tree
Hide file tree
Showing 187 changed files with 10,302 additions and 1,786 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ aplus/secret_key.py
*.sublime-workspace

venv/
venv_aplus/
/static/
/media/

Expand Down
16 changes: 12 additions & 4 deletions aplus/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,22 @@
# local_templates/possible_path/template_name.html
##########################################################################
SITEWIDE_ALERT_TEXT = None
SITEWIDE_ADVERT = None
SITEWIDE_ADVERT = {
'not-before': '2025-01-01', # start showing on 1st
'not-after': '2026-01-04', # last visible date is 3rd
'title': {'en': "Advert", 'fi': "Mainos"},
'text': {'en': "We have open positions",
'fi': "Meillä on paikkoja"},
'href': "https://apluslms.github.io",
'image': "https://apluslms.github.io/assets/images/apluslogo.png",
}
BRAND_NAME = 'A+'
BRAND_NAME_LONG = 'Aplus'
BRAND_DESCRIPTION = 'Virtual Learning Environment'
BRAND_INSTITUTION_NAME = 'Aalto University'
BRAND_INSTITUTION_NAME_FI = 'Aalto-yliopisto'

WELCOME_TEXT = 'Welcome to A+ <small>modern learning environment</small>'
WELCOME_TEXT = 'Welcome to A+ <small class="text-body-secondary">modern learning environment</small>'
SHIBBOLETH_TITLE_TEXT = 'Aalto University users'
SHIBBOLETH_BODY_TEXT = (
'Log in with your Aalto University user account by clicking on the button below. '
Expand All @@ -100,7 +108,7 @@
'For additional information, please see <a href="{privacy_url}">the privacy notice</a>.'
)

WELCOME_TEXT_FI = 'A+ <small>verkkopohjainen oppimisympäristö</small>'
WELCOME_TEXT_FI = 'A+ <small class="text-body-secondary">verkkopohjainen oppimisympäristö</small>'
SHIBBOLETH_TITLE_TEXT_FI = 'Aalto-yliopiston käyttäjät'
SHIBBOLETH_BODY_TEXT_FI = (
'Kirjaudu palveluun Aalto-yliopiston käyttäjätunnuksella alla olevasta painikkeesta. '
Expand Down Expand Up @@ -166,7 +174,7 @@
'django.forms',

# 3rd party applications
'bootstrapform',
'django_bootstrap5',
'rest_framework',
'rest_framework.authtoken',
'pylti1p3.contrib.django.lti1p3_tool_config',
Expand Down
2 changes: 1 addition & 1 deletion apps/templates/plugins/rss.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h3>{{ title }} <small><a href="{{ feed.link }}">[www]</a> <a href="{{ plugin.feed_url }}">[rss]</a></small></h3>
<h3>{{ title }} <small class="text-body-secondary"><a href="{{ feed.link }}">[www]</a> <a href="{{ plugin.feed_url }}">[rss]</a></small></h3>
<ul class="rss-feed">
{% for entry in entries %}
<li>
Expand Down
18 changes: 11 additions & 7 deletions assets/css/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/main.css.map

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions assets/css/vendor/bootstrap-icons/bootstrap-icons.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/css/vendor/bootstrap-icons/bootstrap-icons.css.map

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions assets/css/vendor/bootstrap-icons/bootstrap-icons.min.css

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions assets/css/vendor/bootstrap5/bootstrap-grid.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/css/vendor/bootstrap5/bootstrap-grid.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7867bc4

Please sign in to comment.