diff --git a/static/js/base.js b/static/js/base.js index e69de29bb..0ca1a2b6c 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -0,0 +1,22 @@ +// From https://albertoroura.com/building-a-theme-switcher-for-bootstrap/ + +function setTheme (mode = 'auto') { + const userMode = localStorage.getItem('bs-theme'); + const sysMode = window.matchMedia('(prefers-color-scheme: light)').matches; + const useSystem = mode === 'system' || (!userMode && mode === 'auto'); + const modeChosen = useSystem ? 'system' : mode === 'dark' || mode === 'light' ? mode : userMode; + + if (useSystem) { + localStorage.removeItem('bs-theme'); + } else { + localStorage.setItem('bs-theme', modeChosen); + } + + document.documentElement.setAttribute('data-bs-theme', useSystem ? (sysMode ? 'light' : 'dark') : modeChosen); + document.querySelectorAll('.mode-switch .btn').forEach(e => e.classList.remove('text-body')); + document.getElementById(modeChosen).classList.add('text-body'); +} + +setTheme(); +document.querySelectorAll('.mode-switch .btn').forEach(e => e.addEventListener('click', () => setTheme(e.id))); +window.matchMedia('(prefers-color-scheme: light)').addEventListener('change', () => setTheme()); \ No newline at end of file diff --git a/templates/_base.html b/templates/_base.html index 81a71401a..3cfc860f3 100644 --- a/templates/_base.html +++ b/templates/_base.html @@ -1,12 +1,12 @@ {% load static %} - + - {% block title %}DjangoX{% endblock title %} + DjangoX | {% block title %}{% endblock title %} @@ -15,6 +15,7 @@ + {% endblock %} @@ -23,7 +24,7 @@ diff --git a/templates/account/login.html b/templates/account/login.html index 10fe7bf25..b53a699a5 100644 --- a/templates/account/login.html +++ b/templates/account/login.html @@ -4,10 +4,19 @@ {% block title %}Log in{% endblock %} {% block content %} -

Log in

-
- {% csrf_token %} - {{ form|crispy }} - -
+
+
+
+
+

Login

+
+ {% csrf_token %} + {{ form|crispy }} + +
+
+
+
+
+ {% endblock content %} diff --git a/templates/account/logout.html b/templates/account/logout.html index 5eb974791..883eff480 100644 --- a/templates/account/logout.html +++ b/templates/account/logout.html @@ -5,14 +5,19 @@ {% block content %} -

Sign Out

- -

Are you sure you want to sign out?

- -
- {% csrf_token %} - {{ form|crispy }} - -
- +
+
+
+
+

Sign Out

+
Are you sure you want to sign out?
+
+ {% csrf_token %} + {{ form|crispy }} + +
+
+
+
+ {% endblock content %} \ No newline at end of file diff --git a/templates/account/password_change.html b/templates/account/password_change.html index 937c99a0f..7ee3ad1fe 100644 --- a/templates/account/password_change.html +++ b/templates/account/password_change.html @@ -4,10 +4,18 @@ {% block title %}Change Password{% endblock %} {% block content %} -

Change Password

-
- {% csrf_token %} - {{ form|crispy }} - -
+
+
+
+
+

Change Password

+
+ {% csrf_token %} + {{ form|crispy }} + +
+
+
+
+ {% endblock content %} diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html index be2c91d1b..e2257c7b5 100644 --- a/templates/account/password_reset.html +++ b/templates/account/password_reset.html @@ -4,10 +4,18 @@ {% block title %}Password Reset{% endblock %} {% block content %} -

Forgot your password?

-
- {% csrf_token %} - {{ form | crispy }} - -
+
+
+
+
+

Password Reset

+
+ {% csrf_token %} + {{ form | crispy }} + +
+
+
+
+
{% endblock content %} diff --git a/templates/account/password_reset_done.html b/templates/account/password_reset_done.html index 2e6f3d3ab..ab8065cc2 100644 --- a/templates/account/password_reset_done.html +++ b/templates/account/password_reset_done.html @@ -4,6 +4,15 @@ {% block title %}Password Reset Done{% endblock %} {% block content %} -

Password Reset

-

We have sent you an e-mail. Please contact us if you do not receive it in a few minutes.

+
+
+
+
+

Password Reset

+
We have sent you an e-mail. Please contact us if you do not receive it in a few minutes.
+
+
+
+
+ {% endblock content %} diff --git a/templates/account/password_reset_from_key.html b/templates/account/password_reset_from_key.html index fb9eeb38a..49588eddb 100644 --- a/templates/account/password_reset_from_key.html +++ b/templates/account/password_reset_from_key.html @@ -4,19 +4,30 @@ {% block title %}Change Password{% endblock title %} {% block content %} -

{% if token_fail %}Bad Token{% else %}Change Password{% endif %}

- - {% if token_fail %} -

The password reset link was invalid. Perhaps it has already been used? Please request a new password reset.

- {% else %} - {% if form %} -
- {% csrf_token %} - {{ form|crispy }} - -
- {% else %} -

Your password is now changed.

- {% endif %} - {% endif %} +
+
+
+
+

Password Reset

+ {% if token_fail %} +
+ The password reset link was invalid. Perhaps it has already been used? + Please request a new password reset. +
+ {% else %} + {% if form %} +
+ {% csrf_token %} + {{ form|crispy }} + +
+ {% else %} +

Your password is now changed.

+ {% endif %} + {% endif %} +
+
+
+
+ {% endblock content%} diff --git a/templates/account/password_reset_from_key_done.html b/templates/account/password_reset_from_key_done.html index 58c40944c..6ec7458fc 100644 --- a/templates/account/password_reset_from_key_done.html +++ b/templates/account/password_reset_from_key_done.html @@ -4,6 +4,14 @@ {% block title %}Change Password Done{% endblock title %} {% block content %} -

Password Change Done

-

Your password has been changed.

+
+
+
+
+

Password Reset

+
Your password has been changed.
+
+
+
+
{% endblock content %} \ No newline at end of file diff --git a/templates/account/password_set.html b/templates/account/password_set.html index a46b8f1c1..b7194f410 100644 --- a/templates/account/password_set.html +++ b/templates/account/password_set.html @@ -4,12 +4,18 @@ {% block title %}Set Password{% endblock title %} {% block content %} -
- {% csrf_token %} - {{ form | crispy }} -
- +
+
+
+
+

Set Password

+ + {% csrf_token %} + {{ form|crispy }} + + +
+
- +
{% endblock content %} diff --git a/templates/account/signup.html b/templates/account/signup.html index da021a99c..a16beb34f 100644 --- a/templates/account/signup.html +++ b/templates/account/signup.html @@ -4,10 +4,18 @@ {% block title %}Sign up{% endblock %} {% block content %} -

Sign up

-
- {% csrf_token %} - {{ form|crispy }} - -
+
+
+
+
+

Sign Up

+
+ {% csrf_token %} + {{ form|crispy }} + +
+
+
+
+
{% endblock content %} \ No newline at end of file diff --git a/templates/pages/home.html b/templates/pages/home.html index 2169f640a..dbd73297b 100644 --- a/templates/pages/home.html +++ b/templates/pages/home.html @@ -5,7 +5,7 @@ {% block content %}
- DjangoX logo + DjangoX logo

A Django starter project with batteries.

{% endblock content %}