django-microsys 2.2.5__tar.gz → 2.2.6__tar.gz

django_microsys-2.2.6/LICENSE

@@ -0,0 +1,105 @@
+# MIT License
+
+Software: django-microsys
+Repository: https://github.com/debeski/django-microsys
+Author: DeBeski (micro)
+Website: https://github.com/debeski
+Copyright (c) 2026
+
+---
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+# THIRD-PARTY NOTICES
+
+This Software utilizes the following open-source packages. By using this Software,
+you agree to the terms of their respective licenses:
+
+## Python Runtime Dependencies
+The following Python dependencies are declared by the main `django-microsys`
+package and should retain their upstream license notices.
+
+- Python (3.9+) - Python Software Foundation License (PSFL)
+  https://docs.python.org/3/license.html
+- Django (5.1+) - BSD-3-Clause License
+  https://github.com/django/django/blob/main/LICENSE
+- django-crispy-forms - MIT License
+  https://github.com/django-crispy-forms/django-crispy-forms/blob/main/LICENSE.txt
+- crispy-bootstrap5 - MIT License
+  https://github.com/django-crispy-forms/crispy-bootstrap5/blob/main/LICENSE
+- django-tables2 - BSD-2-Clause License
+  https://github.com/jieter/django-tables2/blob/master/LICENSE
+- django-filter - BSD-3-Clause License
+  https://github.com/carltongibson/django-filter/blob/main/LICENSE
+- psutil - BSD-3-Clause License
+  https://github.com/giampaolo/psutil/blob/master/LICENSE
+- pyotp - MIT License
+  https://github.com/pyauth/pyotp/blob/main/LICENSE
+- qrcode - BSD-3-Clause License
+  https://github.com/lincolnloop/python-qrcode/blob/main/LICENSE
+- Pillow - HPND (Pillow License)
+  https://github.com/python-pillow/Pillow/blob/main/LICENSE
+- Babel - BSD-3-Clause License
+  https://github.com/python-babel/babel/blob/master/LICENSE
+- cryptography - Apache-2.0 OR BSD-3-Clause
+  https://github.com/pyca/cryptography/blob/main/LICENSE
+- openpyxl - MIT License
+  https://foss.heptapod.net/openpyxl/openpyxl/-/blob/branch/default/LICENCE.rst
+
+## Bundled Frontend Assets
+The following third-party frontend assets are bundled under `microsys/static/`
+and should also retain their upstream license notices.
+
+- Bootstrap - MIT License
+  https://github.com/twbs/bootstrap/blob/main/LICENSE
+- Bootstrap Icons - MIT License
+  https://github.com/twbs/icons/blob/main/LICENSE
+- vanillajs-datepicker - MIT License
+  https://github.com/mymth/vanillajs-datepicker/blob/master/LICENSE
+- Driver.js - MIT License
+  https://github.com/nilbuild/driver.js/blob/master/license
+
+## Bundled Font Assets
+The following bundled font assets should also retain their upstream license
+notices and attribution where applicable.
+
+- Cairo - SIL Open Font License 1.1
+  https://github.com/Gue3bara/Cairo/blob/main/OFL.txt
+- Alexandria - SIL Open Font License 1.1
+  https://github.com/Gue3bara/Alexandria/blob/master/OFL.txt
+- Changa - SIL Open Font License 1.1
+  https://github.com/google/fonts/blob/main/ofl/changa/OFL.txt
+- Markazi Text - SIL Open Font License 1.1
+  https://github.com/google/fonts/blob/main/ofl/markazitext/OFL.txt
+- Readex Pro - SIL Open Font License 1.1
+  https://github.com/google/fonts/blob/main/ofl/readexpro/OFL.txt
+- Twemoji Country Flags / Twemoji Mozilla derived asset
+  Upstream references:
+  https://github.com/PasteBar/country-flags-emoji-polyfill-builder
+  https://github.com/mozilla/twemoji-colr/blob/master/LICENSE.md
+  https://github.com/twitter/twemoji/blob/master/LICENSE-GRAPHICS
+
+## Optional Package Note
+This repository also includes optional packages under `optional_packages/`
+with their own dependency trees, such as `django-microsys-sso` and
+`django-microsys-sso-client`. If you distribute those optional packages, keep
+their dependency notices aligned with their own `pyproject.toml` metadata as
+well.

{django_microsys-2.2.5 → django_microsys-2.2.6}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: django_microsys
-Version: 2.2.5
+Version: 2.2.6
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
-License: NON-COMMERCIAL
+License: MIT
 Project-URL: Homepage, https://github.com/debeski/django-microsys
 Keywords: django,microsys,permissions,authentication
 Classifier: Framework :: Django
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Classifier: License :: Other/Proprietary License
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -30,6 +30,7 @@ Requires-Dist: qrcode>=8.2
 Requires-Dist: pillow>=11.0
 Requires-Dist: babel>=2.1
 Requires-Dist: cryptography>=42.0
+Requires-Dist: openpyxl>=3.1
 Provides-Extra: sso
 Requires-Dist: django-microsys-sso>=0.1.0; extra == "sso"
 

{django_microsys-2.2.5 → django_microsys-2.2.6}/django_microsys.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: django-microsys
-Version: 2.2.5
+Version: 2.2.6
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
-License: NON-COMMERCIAL
+License: MIT
 Project-URL: Homepage, https://github.com/debeski/django-microsys
 Keywords: django,microsys,permissions,authentication
 Classifier: Framework :: Django
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Classifier: License :: Other/Proprietary License
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -30,6 +30,7 @@ Requires-Dist: qrcode>=8.2
 Requires-Dist: pillow>=11.0
 Requires-Dist: babel>=2.1
 Requires-Dist: cryptography>=42.0
+Requires-Dist: openpyxl>=3.1
 Provides-Extra: sso
 Requires-Dist: django-microsys-sso>=0.1.0; extra == "sso"
 

{django_microsys-2.2.5 → django_microsys-2.2.6}/django_microsys.egg-info/SOURCES.txt

@@ -30,12 +30,14 @@ microsys/navbar.py
 microsys/patches.py
 microsys/registration.py
 microsys/scaffold.py
+microsys/session_history.py
 microsys/signals.py
 microsys/tables.py
 microsys/themes.py
 microsys/translations.py
 microsys/trust.py
 microsys/urls.py
+microsys/user_reports.py
 microsys/utils.py
 microsys/widgets.py
 microsys/formats/__init__.py
@@ -56,6 +58,7 @@ microsys/migrations/0004_client_ip_and_trusted_devices.py
 microsys/migrations/0005_systemsettings_allow_user_font_override_and_more.py
 microsys/migrations/0006_systemsettings_navbar_config.py
 microsys/migrations/0007_systemsettings_prevent_multiple_active_sessions.py
+microsys/migrations/0008_user_device_presence_history.py
 microsys/migrations/__init__.py
 microsys/scaffold_templates/app/README.md.tmpl
 microsys/scaffold_templates/app/__init__.py.tmpl
@@ -115,13 +118,22 @@ microsys/static/img/login_logo.webp
 microsys/static/microsys/accessibility/css/main.css
 microsys/static/microsys/accessibility/js/main.js
 microsys/static/microsys/activitylog/js/main.js
+microsys/static/microsys/fonts/Alexandria-Bold.woff2
+microsys/static/microsys/fonts/Alexandria-Medium.woff2
+microsys/static/microsys/fonts/Alexandria-Regular.woff2
+microsys/static/microsys/fonts/Changa-Bold.woff2
+microsys/static/microsys/fonts/Changa-Medium.woff2
+microsys/static/microsys/fonts/Changa-Regular.woff2
+microsys/static/microsys/fonts/MarkaziText-Bold.woff2
+microsys/static/microsys/fonts/MarkaziText-Medium.woff2
+microsys/static/microsys/fonts/MarkaziText-Regular.woff2
+microsys/static/microsys/fonts/ReadexPro-Bold.woff2
+microsys/static/microsys/fonts/ReadexPro-Medium.woff2
+microsys/static/microsys/fonts/ReadexPro-Regular.woff2
 microsys/static/microsys/fonts/TwemojiCountryFlags.woff2
 microsys/static/microsys/fonts/cairo-bold.woff2
 microsys/static/microsys/fonts/cairo-medium.woff2
 microsys/static/microsys/fonts/cairo-regular.woff2
-microsys/static/microsys/fonts/shabwa-bold.woff2
-microsys/static/microsys/fonts/shabwa-medium.woff2
-microsys/static/microsys/fonts/shabwa-regular.woff2
 microsys/static/microsys/forms/css/file_field.css
 microsys/static/microsys/forms/css/form_actions.css
 microsys/static/microsys/forms/css/form_fields.css
@@ -135,6 +147,8 @@ microsys/static/microsys/helpers/context_menu/js/section_manager.js
 microsys/static/microsys/helpers/dynamic_modal/js/main.js
 microsys/static/microsys/helpers/scan_link/js/main.js
 microsys/static/microsys/helpers/scan_link/js/scan_button.js
+microsys/static/microsys/helpers/tooltip/css/main.css
+microsys/static/microsys/helpers/tooltip/js/main.js
 microsys/static/microsys/helpers/wizard/js/main.js
 microsys/static/microsys/language/css/main.css
 microsys/static/microsys/language/js/main.js
@@ -166,6 +180,7 @@ microsys/static/microsys/sidebar/js/main.js
 microsys/static/microsys/sidebar/js/preload.js
 microsys/static/microsys/sidebar/js/reorder.js
 microsys/static/microsys/sidebar/js/theme_picker.js
+microsys/static/microsys/themes/css/aether.css
 microsys/static/microsys/themes/css/blue.css
 microsys/static/microsys/themes/css/dark.css
 microsys/static/microsys/themes/css/gold.css
@@ -174,6 +189,7 @@ microsys/static/microsys/themes/css/green.css
 microsys/static/microsys/themes/css/light.css
 microsys/static/microsys/themes/css/mono.css
 microsys/static/microsys/themes/css/neon.css
+microsys/static/microsys/themes/css/prism.css
 microsys/static/microsys/themes/css/red.css
 microsys/static/microsys/themes/css/retro.css
 microsys/static/microsys/themes/js/main.js
@@ -249,6 +265,7 @@ microsys/templates/microsys/users/profile.html
 microsys/templates/microsys/users/profile_image_widget.html
 microsys/templates/microsys/users/user_detail_modal.html
 microsys/templates/microsys/users/user_hub.html
+microsys/templates/microsys/users/user_report_modal.html
 microsys/templates/registration/login.html
 microsys/templates/registration/register.html
 microsys/templates/registration/register_sent.html

{django_microsys-2.2.5 → django_microsys-2.2.6}/django_microsys.egg-info/requires.txt

@@ -9,6 +9,7 @@ qrcode>=8.2
 pillow>=11.0
 babel>=2.1
 cryptography>=42.0
+openpyxl>=3.1
 
 [sso]
 django-microsys-sso>=0.1.0

django_microsys-2.2.6/microsys/VERSION

@@ -0,0 +1 @@
+2.2.6

{django_microsys-2.2.5 → django_microsys-2.2.6}/microsys/constants.py

@@ -56,6 +56,19 @@ TITLEBAR_SURFACE_CHOICES = (
     ('glass', 'Glass'),
 )
 TITLEBAR_SURFACE_VALUES = {value for value, _label in TITLEBAR_SURFACE_CHOICES}
+TITLEBAR_LOGO_TREATMENT_CHOICES = (
+    ('none', 'None'),
+    ('plate', 'Plate'),
+    ('halo', 'Halo'),
+    ('contrast', 'Contrast'),
+)
+TITLEBAR_LOGO_TREATMENT_VALUES = {value for value, _label in TITLEBAR_LOGO_TREATMENT_CHOICES}
+TITLEBAR_LOGO_TREATMENT_SHAPE_CHOICES = (
+    ('soft', 'Soft'),
+    ('pill', 'Pill'),
+    ('square', 'Square'),
+)
+TITLEBAR_LOGO_TREATMENT_SHAPE_VALUES = {value for value, _label in TITLEBAR_LOGO_TREATMENT_SHAPE_CHOICES}
 
 REGISTRATION_ACTIVATION_AUTO_LOGIN = 'auto_login_after_verify'
 REGISTRATION_ACTIVATION_PENDING_APPROVAL = 'verified_pending_approval'

{django_microsys-2.2.5 → django_microsys-2.2.6}/microsys/context_processors.py

@@ -356,10 +356,22 @@ def microsys_context(request):
         context['titlebar'],
     )
     # 8. Font Resolution
-    from .fonts import generate_font_face_css, get_builtin_fonts
+    from .fonts import (
+        DEFAULT_FONT_SLUG,
+        generate_font_face_css,
+        get_builtin_fonts,
+        get_default_font_family,
+        get_font_by_slug,
+    )
+    builtin_fonts = get_builtin_fonts()
     allowed_fonts = normalize_allowed_fonts(final_config.get('allowed_fonts'))
     context['font_face_css'] = generate_font_face_css(allowed_fonts)
-    context['option_fonts'] = [font for font in get_builtin_fonts() if font.get('slug') in allowed_fonts]
+    context['default_font_family'] = get_default_font_family()
+    context['font_families'] = {
+        font['slug']: font['family']
+        for font in builtin_fonts
+    }
+    context['option_fonts'] = [font for font in builtin_fonts if font.get('slug') in allowed_fonts]
     
     allow_user_font_override = bool(final_config.get('allow_user_font_override', True))
     default_fonts_by_lang = final_config.get('default_fonts', {})
@@ -372,16 +384,21 @@ def microsys_context(request):
         active_font = default_fonts_by_lang.get(current_lang)
     
     if not active_font or active_font not in allowed_fonts:
-        # Global fallback based on current language
-        active_font = 'shabwa' if current_lang == 'ar' else 'cairo'
-        
-    # Ensure active_font is valid, else hard fallback to shabwa
+        active_font = DEFAULT_FONT_SLUG
+
+    # Ensure active_font is valid, else hard fallback to cairo
     if active_font not in allowed_fonts and allowed_fonts:
         active_font = allowed_fonts[0]
     elif not active_font:
-        active_font = 'shabwa'
-        
+        active_font = DEFAULT_FONT_SLUG
+
+    active_font_config = get_font_by_slug(active_font) if active_font else None
     context['active_font'] = active_font
+    context['active_font_family'] = (
+        active_font_config.get('family')
+        if active_font_config
+        else get_default_font_family()
+    )
     context['font_picker_enabled'] = bool(allow_user_font_override and len(allowed_fonts) > 1)
     
     return context

{django_microsys-2.2.5 → django_microsys-2.2.6}/microsys/fonts.py

@@ -2,18 +2,11 @@ from functools import lru_cache
 from django.conf import settings
 from django.templatetags.static import static
 
+DEFAULT_FONT_SLUG = 'cairo'
+DEFAULT_FONT_FAMILY = 'Cairo'
+
 # Registry for built-in fonts provided by the package
 _FONT_REGISTRY = (
-    {
-        'slug': 'shabwa',
-        'family': 'Shabwa',
-        'label': 'Shabwa',
-        'variants': [
-            {'weight': 400, 'path': 'microsys/fonts/shabwa-regular.woff2'},
-            {'weight': 600, 'path': 'microsys/fonts/shabwa-medium.woff2'},
-            {'weight': 800, 'path': 'microsys/fonts/shabwa-bold.woff2'},
-        ]
-    },
     {
         'slug': 'cairo',
         'family': 'Cairo',
@@ -24,6 +17,46 @@ _FONT_REGISTRY = (
             {'weight': 800, 'path': 'microsys/fonts/cairo-bold.woff2'},
         ]
     },
+    {
+        'slug': 'changa',
+        'family': 'Changa',
+        'label': 'Changa',
+        'variants': [
+            {'weight': 400, 'path': 'microsys/fonts/Changa-Regular.woff2'},
+            {'weight': 600, 'path': 'microsys/fonts/Changa-Medium.woff2'},
+            {'weight': 800, 'path': 'microsys/fonts/Changa-Bold.woff2'},
+        ]
+    },
+    # {
+    #     'slug': 'markazi_text',
+    #     'family': 'Markazi Text',
+    #     'label': 'Markazi Text',
+    #     'variants': [
+    #         {'weight': 400, 'path': 'microsys/fonts/MarkaziText-Regular.woff2'},
+    #         {'weight': 600, 'path': 'microsys/fonts/MarkaziText-Medium.woff2'},
+    #         {'weight': 800, 'path': 'microsys/fonts/MarkaziText-Bold.woff2'},
+    #     ]
+    # },
+    {
+        'slug': 'readex_pro',
+        'family': 'Readex Pro',
+        'label': 'Readex Pro',
+        'variants': [
+            {'weight': 400, 'path': 'microsys/fonts/ReadexPro-Regular.woff2'},
+            {'weight': 600, 'path': 'microsys/fonts/ReadexPro-Medium.woff2'},
+            {'weight': 800, 'path': 'microsys/fonts/ReadexPro-Bold.woff2'},
+        ]
+    },
+    {
+        'slug': 'alexandria',
+        'family': 'Alexandria',
+        'label': 'Alexandria',
+        'variants': [
+            {'weight': 400, 'path': 'microsys/fonts/Alexandria-Regular.woff2'},
+            {'weight': 600, 'path': 'microsys/fonts/Alexandria-Medium.woff2'},
+            {'weight': 800, 'path': 'microsys/fonts/Alexandria-Bold.woff2'},
+        ]
+    },
 )
 
 @lru_cache(maxsize=1)
@@ -42,6 +75,12 @@ def get_font_by_slug(slug):
             return font
     return None
 
+def get_default_font_family():
+    default_font = get_font_by_slug(DEFAULT_FONT_SLUG)
+    if default_font:
+        return default_font['family']
+    return DEFAULT_FONT_FAMILY
+
 def generate_font_face_css(allowed_fonts=None):
     """
     Generates the @font-face CSS block for all allowed fonts.

{django_microsys-2.2.5 → django_microsys-2.2.6}/microsys/forms.py

@@ -47,6 +47,10 @@ from .constants import (
     TITLEBAR_HEIGHT_VALUES,
     TITLEBAR_HOME_SHAPE_CHOICES,
     TITLEBAR_HOME_SHAPE_VALUES,
+    TITLEBAR_LOGO_TREATMENT_CHOICES,
+    TITLEBAR_LOGO_TREATMENT_SHAPE_CHOICES,
+    TITLEBAR_LOGO_TREATMENT_SHAPE_VALUES,
+    TITLEBAR_LOGO_TREATMENT_VALUES,
     TITLEBAR_SIZE_CHOICES,
     TITLEBAR_SIZE_VALUES,
     TITLEBAR_SURFACE_CHOICES,
@@ -1612,6 +1616,16 @@ class SystemSettingsForm(forms.ModelForm):
         choices=TITLEBAR_SURFACE_CHOICES,
         initial='default',
     )
+    titlebar_logo_treatment = forms.ChoiceField(
+        required=False,
+        choices=TITLEBAR_LOGO_TREATMENT_CHOICES,
+        initial='none',
+    )
+    titlebar_logo_treatment_shape = forms.ChoiceField(
+        required=False,
+        choices=TITLEBAR_LOGO_TREATMENT_SHAPE_CHOICES,
+        initial='soft',
+    )
     email_2fa = forms.BooleanField(
         required=False,
         initial=False,
@@ -1914,6 +1928,11 @@ class SystemSettingsForm(forms.ModelForm):
         self.fields['titlebar_title_size'].label = s.get('form_sys_titlebar_title_size', 'Title size')
         self.fields['titlebar_height'].label = s.get('form_sys_titlebar_height', 'Titlebar height')
         self.fields['titlebar_surface'].label = s.get('form_sys_titlebar_surface', 'Titlebar surface')
+        self.fields['titlebar_logo_treatment'].label = s.get('form_sys_titlebar_logo_treatment', 'Logo treatment')
+        self.fields['titlebar_logo_treatment_shape'].label = s.get(
+            'form_sys_titlebar_logo_treatment_shape',
+            'Logo treatment shape',
+        )
         self.fields['titlebar_show_title'].help_text = s.get(
             'help_sys_titlebar_show_title',
             'Show the system title in the titlebar.',
@@ -1930,6 +1949,14 @@ class SystemSettingsForm(forms.ModelForm):
             'help_sys_titlebar_hide_on_public_unauthenticated_index',
             'Hide the titlebar when an anonymous user opens the public root/home page.',
         )
+        self.fields['titlebar_logo_treatment'].help_text = s.get(
+            'help_sys_titlebar_logo_treatment',
+            'Choose how Microsys visually assists the logo on mixed theme surfaces.',
+        )
+        self.fields['titlebar_logo_treatment_shape'].help_text = s.get(
+            'help_sys_titlebar_logo_treatment_shape',
+            'Choose the plate silhouette when the Plate treatment is active.',
+        )
         self.fields['titlebar_home_shape'].choices = (
             ('circle', s.get('titlebar_home_shape_circle', 'Circle')),
             ('square', s.get('titlebar_home_shape_square', 'Square')),
@@ -1955,6 +1982,17 @@ class SystemSettingsForm(forms.ModelForm):
             ('muted', s.get('titlebar_surface_muted', 'Muted')),
             ('glass', s.get('titlebar_surface_glass', 'Glass')),
         )
+        self.fields['titlebar_logo_treatment'].choices = (
+            ('none', s.get('titlebar_logo_treatment_none', 'None')),
+            ('plate', s.get('titlebar_logo_treatment_plate', 'Plate')),
+            ('halo', s.get('titlebar_logo_treatment_halo', 'Halo')),
+            ('contrast', s.get('titlebar_logo_treatment_contrast', 'Contrast')),
+        )
+        self.fields['titlebar_logo_treatment_shape'].choices = (
+            ('soft', s.get('titlebar_logo_treatment_shape_soft', 'Soft')),
+            ('pill', s.get('titlebar_logo_treatment_shape_pill', 'Pill')),
+            ('square', s.get('titlebar_logo_treatment_shape_square', 'Square')),
+        )
         self.fields['email_2fa'].label = s.get('form_sys_email_2fa', 'Enable Email 2FA')
         self.fields['email_2fa'].help_text = s.get(
             'help_sys_email_2fa',
@@ -2198,6 +2236,50 @@ class SystemSettingsForm(forms.ModelForm):
                 },
             ),
         )
+        _bind_choice_selector_widget(
+            self.fields['titlebar_logo_treatment'],
+            MicrosysChoiceSelectorWidget(
+                variant='toggle',
+                option_meta={
+                    'none': {
+                        'icon': 'bi-slash-circle',
+                        'description': s.get('titlebar_logo_treatment_none_desc', 'Leave the logo as uploaded.'),
+                    },
+                    'plate': {
+                        'icon': 'bi-badge-ad',
+                        'description': s.get('titlebar_logo_treatment_plate_desc', 'Place the logo on an adaptive material plate.'),
+                    },
+                    'halo': {
+                        'icon': 'bi-brightness-high',
+                        'description': s.get('titlebar_logo_treatment_halo_desc', 'Add a subtle adaptive glow behind the logo.'),
+                    },
+                    'contrast': {
+                        'icon': 'bi-circle-half',
+                        'description': s.get('titlebar_logo_treatment_contrast_desc', 'Apply contrast and shadow assistance for simple logos.'),
+                    },
+                },
+            ),
+        )
+        _bind_choice_selector_widget(
+            self.fields['titlebar_logo_treatment_shape'],
+            MicrosysChoiceSelectorWidget(
+                variant='toggle',
+                option_meta={
+                    'soft': {
+                        'icon': 'bi-app',
+                        'description': s.get('titlebar_logo_treatment_shape_soft_desc', 'A modern rounded plate.'),
+                    },
+                    'pill': {
+                        'icon': 'bi-capsule',
+                        'description': s.get('titlebar_logo_treatment_shape_pill_desc', 'A fully rounded capsule plate.'),
+                    },
+                    'square': {
+                        'icon': 'bi-square',
+                        'description': s.get('titlebar_logo_treatment_shape_square_desc', 'A sharper compact plate.'),
+                    },
+                },
+            ),
+        )
         _bind_choice_selector_widget(
             self.fields['navbar_default_mode'],
             MicrosysChoiceSelectorWidget(
@@ -2439,6 +2521,8 @@ class SystemSettingsForm(forms.ModelForm):
         self.initial['titlebar_title_size'] = initial_titlebar_config.get('title_size', 'md')
         self.initial['titlebar_height'] = initial_titlebar_config.get('height', 'balanced')
         self.initial['titlebar_surface'] = initial_titlebar_config.get('surface', 'default')
+        self.initial['titlebar_logo_treatment'] = initial_titlebar_config.get('logo_treatment', 'none')
+        self.initial['titlebar_logo_treatment_shape'] = initial_titlebar_config.get('logo_treatment_shape', 'soft')
 
         catalog_lang = self.initial.get('default_language') or self.instance.default_language or config.get('default_language', 'en')
         public_sidebar_catalog = discover_sidebar_catalog(lang_code=catalog_lang, include_system_items=False)
@@ -2908,6 +2992,28 @@ class SystemSettingsForm(forms.ModelForm):
                 Row(
                     Div(Field('titlebar_surface'), css_class='col-lg-12'),
                 ),
+                Row(
+                    Div(
+                        Field('titlebar_logo_treatment'),
+                        css_class=(
+                            "col-lg-8 ms-titlebar-logo-dependent"
+                            f"{' d-none' if not self.initial.get('titlebar_show_logo', True) else ''}"
+                        ),
+                        aria_hidden='false' if self.initial.get('titlebar_show_logo', True) else 'true',
+                    ),
+                    Div(
+                        Field('titlebar_logo_treatment_shape'),
+                        css_class=(
+                            "col-lg-4 ms-titlebar-logo-plate-dependent"
+                            f"{' d-none' if not (self.initial.get('titlebar_show_logo', True) and self.initial.get('titlebar_logo_treatment', 'none') == 'plate') else ''}"
+                        ),
+                        aria_hidden='false' if (
+                            self.initial.get('titlebar_show_logo', True)
+                            and self.initial.get('titlebar_logo_treatment', 'none') == 'plate'
+                        ) else 'true',
+                    ),
+                    css_class='g-3 mb-3',
+                ),
                 css_class=_step_css_class(5),
             ),
             Div(
@@ -3136,6 +3242,18 @@ class SystemSettingsForm(forms.ModelForm):
             raise ValidationError("Invalid titlebar surface.")
         return value
 
+    def clean_titlebar_logo_treatment(self):
+        value = self.cleaned_data.get('titlebar_logo_treatment') or 'none'
+        if value not in TITLEBAR_LOGO_TREATMENT_VALUES:
+            raise ValidationError("Invalid titlebar logo treatment.")
+        return value
+
+    def clean_titlebar_logo_treatment_shape(self):
+        value = self.cleaned_data.get('titlebar_logo_treatment_shape') or 'soft'
+        if value not in TITLEBAR_LOGO_TREATMENT_SHAPE_VALUES:
+            raise ValidationError("Invalid titlebar logo treatment shape.")
+        return value
+
     def clean_home_url(self):
         value = str(self.cleaned_data.get('home_url') or '').strip()
         discovered_value = str(self.cleaned_data.get('home_url_discovered') or '').strip()
@@ -3336,6 +3454,8 @@ class SystemSettingsForm(forms.ModelForm):
             cleaned['titlebar_title_size'] = titlebar.get('title_size', 'md')
             cleaned['titlebar_height'] = titlebar.get('height', 'balanced')
             cleaned['titlebar_surface'] = titlebar.get('surface', 'default')
+            cleaned['titlebar_logo_treatment'] = titlebar.get('logo_treatment', 'none')
+            cleaned['titlebar_logo_treatment_shape'] = titlebar.get('logo_treatment_shape', 'soft')
 
     def clean(self):
         cleaned = super().clean()
@@ -3453,6 +3573,8 @@ class SystemSettingsForm(forms.ModelForm):
             'title_size': cleaned.get('titlebar_title_size', 'md'),
             'height': cleaned.get('titlebar_height', 'balanced'),
             'surface': cleaned.get('titlebar_surface', 'default'),
+            'logo_treatment': cleaned.get('titlebar_logo_treatment', 'none'),
+            'logo_treatment_shape': cleaned.get('titlebar_logo_treatment_shape', 'soft'),
         })
         if cleaned.get('registration_activation_mode') not in REGISTRATION_ACTIVATION_VALUES:
             cleaned['registration_activation_mode'] = 'auto_login_after_verify'