diff --git a/intranet/apps/context_processors.py b/intranet/apps/context_processors.py index 04c514a77c6..b8b34d7274a 100644 --- a/intranet/apps/context_processors.py +++ b/intranet/apps/context_processors.py @@ -12,7 +12,7 @@ from intranet.apps.notifications.models import NotificationConfig from intranet.apps.oauth.models import CSLApplication -from ..utils.helpers import dark_mode_enabled, get_theme, get_theme_name, get_warning_html +from ..utils.helpers import get_theme, get_theme_name, get_warning_html from .announcements.models import WarningAnnouncement from .schedule.models import Day @@ -178,11 +178,12 @@ def show_bus_button(request): return {"show_bus_nav": is_bus_admin and settings.ENABLE_BUS_APP} -def enable_dark_mode(request): - """ - Export whether dark mode is enabled. - """ - return {"dark_mode_enabled": dark_mode_enabled(request)} +def user_theme_choice(request): + if request.user.is_authenticated: + choice = request.user.theme_properties.theme_choice + else: + choice = request.COOKIES.get("theme_choice", "light") + return {"theme_choice": choice} def oauth_toolkit(request): diff --git a/intranet/apps/preferences/forms.py b/intranet/apps/preferences/forms.py index 10e027f7822..892cd826146 100644 --- a/intranet/apps/preferences/forms.py +++ b/intranet/apps/preferences/forms.py @@ -94,11 +94,17 @@ def flag(label, default): ) -class DarkModeForm(forms.Form): +class ThemeForm(forms.Form): + THEME_CHOICES = [ + ("light", "Light Theme"), + ("dark", "Dark Theme"), + ("twilight", "Twilight Theme"), + ] + def __init__(self, user, *args, **kwargs): super().__init__(*args, **kwargs) - self.fields["dark_mode_enabled"] = forms.BooleanField( - initial=user.dark_mode_properties.dark_mode_enabled, label="Enable dark mode?", required=False + self.fields["theme_choice"] = forms.ChoiceField( + choices=self.THEME_CHOICES, initial=user.theme_properties.theme_choice, label="Select your preferred theme:", required=True ) diff --git a/intranet/apps/preferences/views.py b/intranet/apps/preferences/views.py index 6bcbf78337c..23b042e4c47 100644 --- a/intranet/apps/preferences/views.py +++ b/intranet/apps/preferences/views.py @@ -10,9 +10,9 @@ from ..auth.decorators import eighth_admin_required from ..bus.models import Route from ..users.models import Email -from .forms import BusRouteForm, DarkModeForm, EmailFormset, NotificationOptionsForm, PreferredPictureForm, PrivacyOptionsForm +from .forms import BusRouteForm, EmailFormset, NotificationOptionsForm, PreferredPictureForm, PrivacyOptionsForm, ThemeForm -# from .forms import (BusRouteForm, DarkModeForm, EmailFormset, NotificationOptionsForm, PhoneFormset, PreferredPictureForm, PrivacyOptionsForm, +# from .forms import (BusRouteForm, EmailFormset, NotificationOptionsForm, PhoneFormset, PreferredPictureForm, PrivacyOptionsForm, # WebsiteFormset) @@ -278,16 +278,16 @@ def save_gcm_options(request, user): messages.success(request, "Disabled push notifications") -def save_dark_mode_settings(request, user): - dark_mode_form = DarkModeForm(user, data=request.POST, initial={"dark_mode_enabled": user.dark_mode_properties.dark_mode_enabled}) - if dark_mode_form.is_valid(): - if dark_mode_form.has_changed(): - user.dark_mode_properties.dark_mode_enabled = dark_mode_form.cleaned_data["dark_mode_enabled"] - user.dark_mode_properties.save() - invalidate_obj(request.user.dark_mode_properties) - messages.success(request, ("Dark mode enabled" if user.dark_mode_properties.dark_mode_enabled else "Dark mode disabled")) +def save_theme_settings(request, user): + theme_form = ThemeForm(user, data=request.POST, initial={"theme_choice": user.theme_properties.theme_choice}) + if theme_form.is_valid(): + if theme_form.has_changed(): + user.theme_properties.theme_choice = theme_form.cleaned_data["theme_choice"] + user.theme_properties.save() + invalidate_obj(request.user.theme_properties) + messages.success(request, f"Theme set to {user.theme_properties.theme_choice}") - return dark_mode_form + return theme_form @login_required @@ -314,7 +314,7 @@ def preferences_view(request): privacy_options_form = None notification_options_form = save_notification_options(request, user) - dark_mode_form = save_dark_mode_settings(request, user) + theme_form = save_theme_settings(request, user) for error in errors: messages.error(request, error) @@ -355,7 +355,7 @@ def preferences_view(request): notification_options = get_notification_options(user) notification_options_form = NotificationOptionsForm(user, initial=notification_options) - dark_mode_form = DarkModeForm(user, initial={"dark_mode_enabled": user.dark_mode_properties.dark_mode_enabled}) + theme_form = ThemeForm(user, initial={"theme_choice": user.theme_properties.theme_choice}) context = { # "phone_formset": phone_formset, @@ -365,7 +365,7 @@ def preferences_view(request): "privacy_options_form": privacy_options_form, "notification_options_form": notification_options_form, "bus_route_form": bus_route_form if settings.ENABLE_BUS_APP else None, - "dark_mode_form": dark_mode_form, + "theme_form": theme_form, } return render(request, "preferences/preferences.html", context) diff --git a/intranet/apps/users/migrations/0043_userthemeproperties.py b/intranet/apps/users/migrations/0043_userthemeproperties.py new file mode 100644 index 00000000000..aa15c460e0d --- /dev/null +++ b/intranet/apps/users/migrations/0043_userthemeproperties.py @@ -0,0 +1,23 @@ +# Generated by Django 5.2.4 on 2025-10-18 16:00 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0042_user_seen_april_fools'), + ] + + operations = [ + migrations.CreateModel( + name='UserThemeProperties', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('theme_choice', models.CharField(default='light_theme', max_length=100)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='theme_properties', to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/intranet/apps/users/models.py b/intranet/apps/users/models.py index a4a5212abf7..e86dc76e889 100644 --- a/intranet/apps/users/models.py +++ b/intranet/apps/users/models.py @@ -1095,6 +1095,8 @@ def __getattr__(self, name): return UserProperties.objects.get_or_create(user=self)[0] elif name == "dark_mode_properties": return UserDarkModeProperties.objects.get_or_create(user=self)[0] + elif name == "theme_properties": + return UserThemeProperties.objects.get_or_create(user=self)[0] raise AttributeError(f"{type(self).__name__!r} object has no attribute {name!r}") def __str__(self): @@ -1289,6 +1291,18 @@ def __str__(self): return str(self.user) +class UserThemeProperties(models.Model): + """ + Contains user properties relating to themes + """ + + user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name="theme_properties", on_delete=models.CASCADE) + theme_choice = models.CharField(max_length=100, default="light_theme") + + def __str__(self): + return str(self.user) + + class Email(models.Model): """Represents an email address""" diff --git a/intranet/settings/__init__.py b/intranet/settings/__init__.py index 43841e51d63..d96f1e13e92 100644 --- a/intranet/settings/__init__.py +++ b/intranet/settings/__init__.py @@ -402,6 +402,22 @@ "dark/oauth", "dark/sessionmgmt", "dark/logs", + "twilight/base", + "twilight/nav", + "twilight/cke", + "twilight/dashboard", + "twilight/preferences", + "twilight/eighth.signup", + "twilight/about", + "twilight/login", + "twilight/events", + "twilight/select", + "twilight/enrichment", + "twilight/files", + "twilight/lostfound", + "twilight/polls", + "twilight/printing", + "twilight/welcome" ] for name in LIST_OF_INDEPENDENT_CSS: @@ -452,7 +468,7 @@ "intranet.apps.context_processors.show_homecoming", # Sitewide custom themes (special events, etc) "intranet.apps.context_processors.global_custom_theme", # Sitewide custom themes (special events, etc) "intranet.apps.context_processors.show_bus_button", - "intranet.apps.context_processors.enable_dark_mode", + "intranet.apps.context_processors.user_theme_choice", "intranet.apps.context_processors.oauth_toolkit", # Django OAuth Toolkit-related middleware "intranet.apps.context_processors.settings_export", # "Exports" django.conf.settings as DJANGO_SETTINGS "intranet.apps.features.context_processors.feature_announcements", # Feature announcements that need to be shown on the current page diff --git a/intranet/static/css/twilight/_colors.scss b/intranet/static/css/twilight/_colors.scss new file mode 100644 index 00000000000..6d15a507895 --- /dev/null +++ b/intranet/static/css/twilight/_colors.scss @@ -0,0 +1,7 @@ +$page_background: #171717; +$widget_background: #202020; +$announcement_background: #181818; +$dark_border: #404040; +$text_primary: #B7B7B7; +$text_high_contrast: #FFF; +$accent_color: #2b7fff; \ No newline at end of file diff --git a/intranet/static/css/twilight/about.scss b/intranet/static/css/twilight/about.scss new file mode 100644 index 00000000000..cf15b0d02f9 --- /dev/null +++ b/intranet/static/css/twilight/about.scss @@ -0,0 +1,5 @@ +@import './colors'; + +.center { + background-color: $page_background; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/base.scss b/intranet/static/css/twilight/base.scss new file mode 100644 index 00000000000..ba194380324 --- /dev/null +++ b/intranet/static/css/twilight/base.scss @@ -0,0 +1,78 @@ +@import './colors'; + +body { + color: #B7B7B7; + background-color: $page_background; +} + +button, a.button, input[type="button"], input[type="submit"], input[type="reset"] { + color: #B7B7B7; + background-color: #151515; + background-image: linear-gradient(to bottom, #0E0E0E 0%, #121212 100%); + text-shadow: none; + border-color: $dark_border; +} + +button:hover, a.button:hover, input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover { + color: #CDCDCD; + background-color: #1C1C1C; + background-image: linear-gradient(to bottom, #1C1C1C 0%, #202020 100%); +} + +.widget, .widget-content { + background-color: $widget_background; + border-color: $dark_border; + border-width: 1px; +} + +.widget-title { + background: #151515; + border-color: $dark_border; +} + +input[type="text"] { + background-color: $widget_background; + border-color: $dark_border; + color: white; +} + +.header .search input[type="text"] { + background-color: $widget_background; + color: white; + font-weight: bold; +} + +.main ul.nav > li { + border-color: $dark_border; +} + +textarea { + background-color: $widget_background; + border-color: $dark_border; + color: white; +} + +.selectize-input { + background-color: $widget_background !important; + border-color: $dark_border !important; + color: $text_primary !important; +} + +input[type="text"] .selectize-input { + background-color: $widget_background !important; + border-color: $dark_border !important; + color: $text_primary !important; +} + +.selectize-dropdown { + background: $widget_background; + border: 1px solid $dark_border; + outline: $dark_border; +} + +.selectize-dropdown-content { + background: $widget_background; + border-color: $dark_border; + color: $text_primary; + scrollbar-color: $dark_border $widget_background; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/cke.scss b/intranet/static/css/twilight/cke.scss new file mode 100644 index 00000000000..06efda37808 --- /dev/null +++ b/intranet/static/css/twilight/cke.scss @@ -0,0 +1,14 @@ +@import './colors'; + +.cke { + background: $page_background !important; + border-color: $dark_border !important; +} + +.cke_top { + background: $page_background !important; +} + +.cke_contents iframe { + background-color: $widget_background !important; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/dashboard.scss b/intranet/static/css/twilight/dashboard.scss new file mode 100644 index 00000000000..e710cbf67b9 --- /dev/null +++ b/intranet/static/css/twilight/dashboard.scss @@ -0,0 +1,33 @@ +@import './colors'; + +.announcement, .club-announcements, .announcement-meta, .event { + background: $announcement_background; + border-color: $dark_border; + border-radius: 5px; + + h3 > a.announcement-link { + color: #D8D8D8 !important; + } + + &-metadata { + color: darkgray; + } + + &.partially-hidden .announcement-toggle-content::after { + background-image: linear-gradient( + to bottom, + rgba(255, 255, 255, 0), + black 80% + ); + } + + &.club-announcements { + background-color: rgb(24, 24, 24); + } +} + +.club-announcement-filters > .club-announcement-filter { + background-color: $widget_background; + border-color: $dark_border; + outline-color: $dark_border; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/eighth.signup.scss b/intranet/static/css/twilight/eighth.signup.scss new file mode 100644 index 00000000000..f99741dee7e --- /dev/null +++ b/intranet/static/css/twilight/eighth.signup.scss @@ -0,0 +1,38 @@ +@import './colors'; + +.day-picker { + border-color: $dark_border; + + &-buttons button { + border-color: $dark_border; + } + + &-buttons button:hover { + border-color: $dark_border; + } + + .day { + outline-color: $dark_border; + scrollbar-color: $dark_border $widget_background; + } +} + +.search-wrapper { + background-color: $widget_background; + border-color: $dark_border; +} + +#activity-picker { + border-color: $dark_border; + scrollbar-color: $dark_border $widget_background; + + * { /* for each child element */ + border-color: $dark_border; + outline-color: $dark_border; + } +} + +#activity-detail { + background-color: $widget_background; + border-color: $dark_border; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/enrichment.scss b/intranet/static/css/twilight/enrichment.scss new file mode 100644 index 00000000000..f144d8bbb91 --- /dev/null +++ b/intranet/static/css/twilight/enrichment.scss @@ -0,0 +1,5 @@ +@import './colors'; + +.schedule tr td { + border: 1px solid $dark_border; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/events.scss b/intranet/static/css/twilight/events.scss new file mode 100644 index 00000000000..a449aeae522 --- /dev/null +++ b/intranet/static/css/twilight/events.scss @@ -0,0 +1,6 @@ +@import './colors'; + +.event { + background-color: $widget_background; + border-color: $dark_border; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/files.scss b/intranet/static/css/twilight/files.scss new file mode 100644 index 00000000000..ea764b17cf2 --- /dev/null +++ b/intranet/static/css/twilight/files.scss @@ -0,0 +1,14 @@ +@import './colors'; + +.filesystem { + background-color: $widget_background; + border-color: $dark_border; +} + +.filesystem a { + color: white; +} + +table.directory-list a, table.directory-list a:link, table.directory-list a:visited, table.directory-list a:hover, table.directory-list a:active { + color: $text_primary; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/login.scss b/intranet/static/css/twilight/login.scss new file mode 100644 index 00000000000..cd4137a093d --- /dev/null +++ b/intranet/static/css/twilight/login.scss @@ -0,0 +1,25 @@ +@import './colors'; + +body.login-page input { + background-color: $widget_background; + border-color: $dark_border; + color: $text_primary; +} + +body.login-page .login input[type="submit"] { + background-color: $widget_background; + border-color: $dark_border; + color: $text_primary; +} + +body.login-page input:hover { + border-color: $accent_color; +} + +body.login-page .login input[type="submit"]:hover { + border-color: $accent_color; +} + +.footer { + background: $page_background; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/lostfound.scss b/intranet/static/css/twilight/lostfound.scss new file mode 100644 index 00000000000..d6d9879bf21 --- /dev/null +++ b/intranet/static/css/twilight/lostfound.scss @@ -0,0 +1,7 @@ +@import './colors'; + +.item { + background-color: $widget_background; + border-color: $dark_border; +} + diff --git a/intranet/static/css/twilight/nav.scss b/intranet/static/css/twilight/nav.scss new file mode 100644 index 00000000000..ec0cc45122c --- /dev/null +++ b/intranet/static/css/twilight/nav.scss @@ -0,0 +1,12 @@ +@import './colors'; + +ul.nav { + background-color: $widget_background; + border-color: $dark_border; + border-width: 1px; +} + +ul.nav li { + border-color: $dark_border; + border-width: 1px; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/polls.scss b/intranet/static/css/twilight/polls.scss new file mode 100644 index 00000000000..08dd3d1bd31 --- /dev/null +++ b/intranet/static/css/twilight/polls.scss @@ -0,0 +1,18 @@ +@import './colors'; + +#questions .question [contenteditable="true"] { + background-color: $widget_background; + border-color: $dark_border; +} + +input { + background-color: $widget_background !important; + border-color: $dark_border !important; + color: white; +} + +.poll { + background-color: $page_background; + font-weight: bold; + border-color: $dark_border; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/printing.scss b/intranet/static/css/twilight/printing.scss new file mode 100644 index 00000000000..00c996011a1 --- /dev/null +++ b/intranet/static/css/twilight/printing.scss @@ -0,0 +1,16 @@ +@import './colors'; + +.working { + background-color: #00c951; + color: $text_primary; +} + +.broken { + background-color: #efb100; + color: $text_primary; +} + +.error { + background-color: #fb2c36; + color: $text_primary; +} diff --git a/intranet/static/css/twilight/select.scss b/intranet/static/css/twilight/select.scss new file mode 100644 index 00000000000..1458578bec9 --- /dev/null +++ b/intranet/static/css/twilight/select.scss @@ -0,0 +1,7 @@ +@import './colors'; + +select { + background-color: $widget_background; + border-color: $dark_border; + color: $text_primary; +} \ No newline at end of file diff --git a/intranet/static/css/twilight/welcome.scss b/intranet/static/css/twilight/welcome.scss new file mode 100644 index 00000000000..080b98426c2 --- /dev/null +++ b/intranet/static/css/twilight/welcome.scss @@ -0,0 +1,6 @@ +@import './colors'; + + +#welcome { + background-color: $page_background; +} \ No newline at end of file diff --git a/intranet/templates/announcements/add_modify.html b/intranet/templates/announcements/add_modify.html index dbbdb8c0a6b..76c630a526e 100644 --- a/intranet/templates/announcements/add_modify.html +++ b/intranet/templates/announcements/add_modify.html @@ -34,11 +34,15 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/cke' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/announcements/approve.html b/intranet/templates/announcements/approve.html index 39cd0c26246..eefb54b2298 100644 --- a/intranet/templates/announcements/approve.html +++ b/intranet/templates/announcements/approve.html @@ -39,11 +39,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/cke' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/cke' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/announcements/club-request.html b/intranet/templates/announcements/club-request.html index c70c82c6285..61ff524e1d0 100644 --- a/intranet/templates/announcements/club-request.html +++ b/intranet/templates/announcements/club-request.html @@ -33,11 +33,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/cke' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/cke' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/announcements/delete.html b/intranet/templates/announcements/delete.html index 94203622e85..6a59b7e3479 100644 --- a/intranet/templates/announcements/delete.html +++ b/intranet/templates/announcements/delete.html @@ -26,10 +26,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/announcements/request.html b/intranet/templates/announcements/request.html index d3c8634b397..d521fdf4197 100644 --- a/intranet/templates/announcements/request.html +++ b/intranet/templates/announcements/request.html @@ -34,11 +34,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/cke' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/cke' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/announcements/request_status.html b/intranet/templates/announcements/request_status.html index de82f098d63..6ab32df2870 100644 --- a/intranet/templates/announcements/request_status.html +++ b/intranet/templates/announcements/request_status.html @@ -17,10 +17,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/announcements/success.html b/intranet/templates/announcements/success.html index f97627bc8d7..022c894bdd3 100644 --- a/intranet/templates/announcements/success.html +++ b/intranet/templates/announcements/success.html @@ -17,10 +17,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/announcements/view.html b/intranet/templates/announcements/view.html index 80c27c7d225..4b901a203f3 100644 --- a/intranet/templates/announcements/view.html +++ b/intranet/templates/announcements/view.html @@ -20,11 +20,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/dashboard' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/dashboard' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/auth/about.html b/intranet/templates/auth/about.html index 147348fae81..0b8de5d9e6d 100644 --- a/intranet/templates/auth/about.html +++ b/intranet/templates/auth/about.html @@ -19,11 +19,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/login' %} {% stylesheet 'dark/about' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/about' %} + {% endif %} {% endblock %} {% block body %} diff --git a/intranet/templates/auth/login.html b/intranet/templates/auth/login.html index 67dbc68e6ee..413e0afa70a 100644 --- a/intranet/templates/auth/login.html +++ b/intranet/templates/auth/login.html @@ -39,13 +39,18 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/login' %} {% stylesheet 'dark/schedule' %} {% stylesheet 'dark/events' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/login' %} + {% stylesheet 'twilight/events' %} + {% endif %} {% endblock %} {% block bodyclass %} login-page{% if login_warning %} has-login-warning{% endif %}{% endblock %} diff --git a/intranet/templates/auth/reauth.html b/intranet/templates/auth/reauth.html index e977ff058c6..1127c7c010b 100644 --- a/intranet/templates/auth/reauth.html +++ b/intranet/templates/auth/reauth.html @@ -30,11 +30,15 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/login' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/login' %} + {% endif %} {% endblock %} {% block bodyclass %} login-page{% if login_warning %} has-login-warning{% endif %}{% endblock %} diff --git a/intranet/templates/auth/reset_password.html b/intranet/templates/auth/reset_password.html index e17ecc76379..246bbd3e52a 100644 --- a/intranet/templates/auth/reset_password.html +++ b/intranet/templates/auth/reset_password.html @@ -26,11 +26,15 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/login' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/login' %} + {% endif %} {% endblock %} {% block bodyclass %} login-page{% if login_warning %} has-login-warning{% endif %}{% endblock %} diff --git a/intranet/templates/bus/home.html b/intranet/templates/bus/home.html index a5b7a59d9fb..10d38a1f473 100644 --- a/intranet/templates/bus/home.html +++ b/intranet/templates/bus/home.html @@ -21,11 +21,15 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/bus' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} diff --git a/intranet/templates/bus/morning.html b/intranet/templates/bus/morning.html index b1e3e5691f8..12940a5dd49 100644 --- a/intranet/templates/bus/morning.html +++ b/intranet/templates/bus/morning.html @@ -21,11 +21,15 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/bus' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/dashboard/dashboard.html b/intranet/templates/dashboard/dashboard.html index 98cb44e29c5..f2b0b691636 100644 --- a/intranet/templates/dashboard/dashboard.html +++ b/intranet/templates/dashboard/dashboard.html @@ -44,7 +44,7 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/dashboard' %} @@ -53,6 +53,11 @@ {% stylesheet 'dark/schedule.widget' %} {% stylesheet 'dark/events' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/dashboard' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/docs/api-oauth-aup.html b/intranet/templates/docs/api-oauth-aup.html index a1528fef3ac..84c89d18cf9 100644 --- a/intranet/templates/docs/api-oauth-aup.html +++ b/intranet/templates/docs/api-oauth-aup.html @@ -15,11 +15,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/login' %} {% stylesheet 'dark/about' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/login' %} + {% stylesheet 'twilight/about' %} + {% endif %} {% endblock %} {% block body %} diff --git a/intranet/templates/eighth/absences.html b/intranet/templates/eighth/absences.html index 8f8a981eca5..a6ebd318572 100644 --- a/intranet/templates/eighth/absences.html +++ b/intranet/templates/eighth/absences.html @@ -13,10 +13,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/eighth/activity.html b/intranet/templates/eighth/activity.html index 223665f5ddc..9f26a51bbaf 100644 --- a/intranet/templates/eighth/activity.html +++ b/intranet/templates/eighth/activity.html @@ -32,10 +32,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/eighth/activity_settings.html b/intranet/templates/eighth/activity_settings.html index fb1cbd31266..74ac8c10ce2 100644 --- a/intranet/templates/eighth/activity_settings.html +++ b/intranet/templates/eighth/activity_settings.html @@ -30,10 +30,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/eighth/admin/distribute_group.html b/intranet/templates/eighth/admin/distribute_group.html index 07d885044a5..2e190a77f9f 100644 --- a/intranet/templates/eighth/admin/distribute_group.html +++ b/intranet/templates/eighth/admin/distribute_group.html @@ -11,7 +11,7 @@ {% block head %} {{ block.super }} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/eighth.schedule' %} {% endif %} {% endblock %} diff --git a/intranet/templates/eighth/admin/eighth_admin_page_base.html b/intranet/templates/eighth/admin/eighth_admin_page_base.html index e15a3c103b4..403867dcbf0 100644 --- a/intranet/templates/eighth/admin/eighth_admin_page_base.html +++ b/intranet/templates/eighth/admin/eighth_admin_page_base.html @@ -13,10 +13,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block js %} diff --git a/intranet/templates/eighth/admin/list_sponsor_by_activity.html b/intranet/templates/eighth/admin/list_sponsor_by_activity.html index f291eff90dc..a19a9022548 100644 --- a/intranet/templates/eighth/admin/list_sponsor_by_activity.html +++ b/intranet/templates/eighth/admin/list_sponsor_by_activity.html @@ -35,7 +35,7 @@ {% block head %} {{ block.super }} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% endif %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/itemreg/search.html b/intranet/templates/itemreg/search.html index ad04833f49b..b1a8069e527 100644 --- a/intranet/templates/itemreg/search.html +++ b/intranet/templates/itemreg/search.html @@ -57,11 +57,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/select' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/select' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/logs/home.html b/intranet/templates/logs/home.html index 87b2e4361aa..1d3bc9cd18a 100644 --- a/intranet/templates/logs/home.html +++ b/intranet/templates/logs/home.html @@ -17,11 +17,15 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/logs' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block js %} diff --git a/intranet/templates/logs/query.html b/intranet/templates/logs/query.html index 5b4c8ac781a..96d5c61b293 100644 --- a/intranet/templates/logs/query.html +++ b/intranet/templates/logs/query.html @@ -12,10 +12,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block js %} diff --git a/intranet/templates/logs/request.html b/intranet/templates/logs/request.html index 1ca87acd81a..bb21df9ff22 100644 --- a/intranet/templates/logs/request.html +++ b/intranet/templates/logs/request.html @@ -8,10 +8,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block js %} diff --git a/intranet/templates/lostfound/founditem_delete.html b/intranet/templates/lostfound/founditem_delete.html index 06f9735691e..3ae303c9567 100644 --- a/intranet/templates/lostfound/founditem_delete.html +++ b/intranet/templates/lostfound/founditem_delete.html @@ -16,10 +16,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/lostfound/founditem_form.html b/intranet/templates/lostfound/founditem_form.html index cd053f03627..a13b67acc6e 100644 --- a/intranet/templates/lostfound/founditem_form.html +++ b/intranet/templates/lostfound/founditem_form.html @@ -52,11 +52,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/lostfound' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/lostfound' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/lostfound/home.html b/intranet/templates/lostfound/home.html index b51c356c24e..5e10edc562a 100644 --- a/intranet/templates/lostfound/home.html +++ b/intranet/templates/lostfound/home.html @@ -17,11 +17,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/lostfound' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/lostfound' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/lostfound/item_view.html b/intranet/templates/lostfound/item_view.html index 7fd11bf361d..b70b8c2bea5 100644 --- a/intranet/templates/lostfound/item_view.html +++ b/intranet/templates/lostfound/item_view.html @@ -17,11 +17,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/lostfound' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/lostfound' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/lostfound/lostitem_delete.html b/intranet/templates/lostfound/lostitem_delete.html index cfaf90981bc..b59178534db 100644 --- a/intranet/templates/lostfound/lostitem_delete.html +++ b/intranet/templates/lostfound/lostitem_delete.html @@ -16,10 +16,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/lostfound/lostitem_form.html b/intranet/templates/lostfound/lostitem_form.html index c4f326d6fcd..fe54b0b579e 100644 --- a/intranet/templates/lostfound/lostitem_form.html +++ b/intranet/templates/lostfound/lostitem_form.html @@ -52,11 +52,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/lostfound' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/lostfound' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/notifications/gcm_list.html b/intranet/templates/notifications/gcm_list.html index 411d8c64c7a..9abf679e946 100644 --- a/intranet/templates/notifications/gcm_list.html +++ b/intranet/templates/notifications/gcm_list.html @@ -15,10 +15,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/notifications/gcm_post.html b/intranet/templates/notifications/gcm_post.html index 8f4745f59f9..f6357e79c8d 100644 --- a/intranet/templates/notifications/gcm_post.html +++ b/intranet/templates/notifications/gcm_post.html @@ -27,10 +27,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/oauth2_provider/authorized-tokens.html b/intranet/templates/oauth2_provider/authorized-tokens.html index 95886cc4265..c3a354a6ec7 100644 --- a/intranet/templates/oauth2_provider/authorized-tokens.html +++ b/intranet/templates/oauth2_provider/authorized-tokens.html @@ -74,7 +74,7 @@ font-family: monospace; padding: 0px 2px; color: black; - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} color: white; {% endif %} } diff --git a/intranet/templates/oauth2_provider/base.html b/intranet/templates/oauth2_provider/base.html index 0764724acc7..9a453f82ab0 100644 --- a/intranet/templates/oauth2_provider/base.html +++ b/intranet/templates/oauth2_provider/base.html @@ -24,12 +24,17 @@ crossorigin="anonymous"> {% endblock %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/login' %} {% stylesheet 'dark/about' %} {% stylesheet 'dark/oauth' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/login' %} + {% stylesheet 'twilight/about' %} + {% endif %} {% block back %}{% endblock %} diff --git a/intranet/templates/parking/car.html b/intranet/templates/parking/car.html index 1570e031b99..30042eaafb0 100644 --- a/intranet/templates/parking/car.html +++ b/intranet/templates/parking/car.html @@ -27,10 +27,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/parking/form.html b/intranet/templates/parking/form.html index a3cd7695257..cecb6a0beac 100644 --- a/intranet/templates/parking/form.html +++ b/intranet/templates/parking/form.html @@ -22,10 +22,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/parking/intro.html b/intranet/templates/parking/intro.html index a35f6f19b63..f0c14c96a1e 100644 --- a/intranet/templates/parking/intro.html +++ b/intranet/templates/parking/intro.html @@ -20,10 +20,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/parking/joint.html b/intranet/templates/parking/joint.html index fe5f5965a19..b7121dc52cd 100644 --- a/intranet/templates/parking/joint.html +++ b/intranet/templates/parking/joint.html @@ -28,10 +28,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/polls/add_modify.html b/intranet/templates/polls/add_modify.html index bd4643efdab..0aa50f79861 100644 --- a/intranet/templates/polls/add_modify.html +++ b/intranet/templates/polls/add_modify.html @@ -31,12 +31,18 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/cke' %} {% stylesheet 'dark/polls' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/cke' %} + {% stylesheet 'twilight/polls' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/polls/delete.html b/intranet/templates/polls/delete.html index e4be949d75d..4b8085283fb 100644 --- a/intranet/templates/polls/delete.html +++ b/intranet/templates/polls/delete.html @@ -13,11 +13,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/polls' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/polls' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/polls/home.html b/intranet/templates/polls/home.html index eba848fcc62..bdd99abe564 100644 --- a/intranet/templates/polls/home.html +++ b/intranet/templates/polls/home.html @@ -13,11 +13,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/polls' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/polls' %} + {% endif %} {% endblock %} {% block js %} diff --git a/intranet/templates/polls/results.html b/intranet/templates/polls/results.html index c1b6e1ceea2..b7d429b83c7 100644 --- a/intranet/templates/polls/results.html +++ b/intranet/templates/polls/results.html @@ -58,11 +58,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/polls' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/polls' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/polls/vote.html b/intranet/templates/polls/vote.html index 17e5cf735db..84ca78fe941 100644 --- a/intranet/templates/polls/vote.html +++ b/intranet/templates/polls/vote.html @@ -104,11 +104,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/polls' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/polls' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/polls/winners.html b/intranet/templates/polls/winners.html index c5f2ee49cad..aa21921de42 100644 --- a/intranet/templates/polls/winners.html +++ b/intranet/templates/polls/winners.html @@ -30,11 +30,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/polls' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/polls' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/preferences/preferences.html b/intranet/templates/preferences/preferences.html index 24ff9f7e21a..c725c1ecdff 100644 --- a/intranet/templates/preferences/preferences.html +++ b/intranet/templates/preferences/preferences.html @@ -64,11 +64,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/preferences' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/preferences' %} + {% endif %} {% endblock %} {% block main %} @@ -233,9 +238,9 @@

Privacy Options

{% endif %} {% endcomment %} - {% if dark_mode_form %} -

Dark Mode

- {% for field in dark_mode_form %} + {% if theme_form %} +

Theme

+ {% for field in theme_form %} {{ field.label }} {{ field }} {% endfor %} diff --git a/intranet/templates/preferences/privacy_options.html b/intranet/templates/preferences/privacy_options.html index 7569a2450c9..d2a8817b8a9 100644 --- a/intranet/templates/preferences/privacy_options.html +++ b/intranet/templates/preferences/privacy_options.html @@ -50,11 +50,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/preferences' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/preferences' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/printing/print.html b/intranet/templates/printing/print.html index c04a1dcc90b..9bfd647b0fb 100644 --- a/intranet/templates/printing/print.html +++ b/intranet/templates/printing/print.html @@ -23,11 +23,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/printing' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/printing' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/schedule/admin_add.html b/intranet/templates/schedule/admin_add.html index 818a595312c..767a7055a8e 100644 --- a/intranet/templates/schedule/admin_add.html +++ b/intranet/templates/schedule/admin_add.html @@ -38,11 +38,16 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/schedule' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/schedule' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/schedule/admin_comment.html b/intranet/templates/schedule/admin_comment.html index cd33783fa2f..78939d22299 100644 --- a/intranet/templates/schedule/admin_comment.html +++ b/intranet/templates/schedule/admin_comment.html @@ -25,13 +25,19 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/schedule' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/schedule' %} + {% endif %} {% endblock %} + {% block main %}
diff --git a/intranet/templates/schedule/admin_daytype.html b/intranet/templates/schedule/admin_daytype.html index 77ccc5a6020..77db8535107 100644 --- a/intranet/templates/schedule/admin_daytype.html +++ b/intranet/templates/schedule/admin_daytype.html @@ -127,13 +127,19 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/schedule' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/schedule' %} + {% endif %} {% endblock %} + {% block main %}
diff --git a/intranet/templates/schedule/admin_home.html b/intranet/templates/schedule/admin_home.html index 3c1fd808e8e..7a3d87ecb07 100644 --- a/intranet/templates/schedule/admin_home.html +++ b/intranet/templates/schedule/admin_home.html @@ -191,13 +191,19 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/schedule' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/schedule' %} + {% endif %} {% endblock %} + {% block main %}
diff --git a/intranet/templates/schedule/calendar.html b/intranet/templates/schedule/calendar.html index 02c591a9e7b..7bff650aac5 100644 --- a/intranet/templates/schedule/calendar.html +++ b/intranet/templates/schedule/calendar.html @@ -59,13 +59,19 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/schedule' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/schedule' %} + {% endif %} {% endblock %} + {% block main %}

Schedule

diff --git a/intranet/templates/schedule/fill.html b/intranet/templates/schedule/fill.html index 130a94b8386..ea63282e1f4 100644 --- a/intranet/templates/schedule/fill.html +++ b/intranet/templates/schedule/fill.html @@ -15,13 +15,19 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/schedule' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/schedule' %} + {% endif %} {% endblock %} + {% block main %}
diff --git a/intranet/templates/search/search_results.html b/intranet/templates/search/search_results.html index e76ae7f7a06..9ccc68dbaba 100644 --- a/intranet/templates/search/search_results.html +++ b/intranet/templates/search/search_results.html @@ -15,12 +15,17 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} + {% block main %}
diff --git a/intranet/templates/seniors/add.html b/intranet/templates/seniors/add.html index 217e8a7c947..bfed9d22ca5 100644 --- a/intranet/templates/seniors/add.html +++ b/intranet/templates/seniors/add.html @@ -36,12 +36,17 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} + {% block main %}

Add Destination Info

diff --git a/intranet/templates/seniors/home.html b/intranet/templates/seniors/home.html index 7c79ca1339d..a5beb6dbdca 100644 --- a/intranet/templates/seniors/home.html +++ b/intranet/templates/seniors/home.html @@ -26,10 +26,14 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/sessionmgmt/index.html b/intranet/templates/sessionmgmt/index.html index cbfb566d7a7..71aa287ae93 100644 --- a/intranet/templates/sessionmgmt/index.html +++ b/intranet/templates/sessionmgmt/index.html @@ -9,11 +9,15 @@ {% block head %} {% stylesheet 'sessionmgmt' %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/sessionmgmt' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% endif %} {% endblock %} {% block main %} diff --git a/intranet/templates/signage/pages/eighth.html b/intranet/templates/signage/pages/eighth.html index 9be751c7c73..f94ea898d5f 100644 --- a/intranet/templates/signage/pages/eighth.html +++ b/intranet/templates/signage/pages/eighth.html @@ -315,12 +315,17 @@ {% endblock %} {% block head %} - {% if dark_mode_enabled %} + {% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% stylesheet 'dark/base' %} {% stylesheet 'dark/nav' %} {% stylesheet 'dark/eighth.signup' %} {% endif %} + {% if theme_choice == 'twilight' %} + {% stylesheet 'twilight/base' %} + {% stylesheet 'twilight/nav' %} + {% stylesheet 'twilight/eighth.signup' %} + {% endif %} {% endblock %} {% block body %} diff --git a/intranet/templates/special/senior_dests_banner.html b/intranet/templates/special/senior_dests_banner.html index b4fd6540f7a..9cc2b0423cd 100644 --- a/intranet/templates/special/senior_dests_banner.html +++ b/intranet/templates/special/senior_dests_banner.html @@ -1,6 +1,6 @@ {% load static %} -{% if dark_mode_enabled %} +{% if theme_choice == 'dark' or theme_choice == 'twilight' %} {% else %} diff --git a/intranet/templates/special/tjstar_ribbon.html b/intranet/templates/special/tjstar_ribbon.html index d49d8bdd8c3..a8bd84b8501 100644 --- a/intranet/templates/special/tjstar_ribbon.html +++ b/intranet/templates/special/tjstar_ribbon.html @@ -10,7 +10,7 @@ -{% if dark_mode_enabled %} +{% if theme_choice == 'dark' or theme_choice == 'twilight' %}