django-microsys 2.1.9__tar.gz → 2.2.0__tar.gz

{django_microsys-2.1.9 → django_microsys-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_microsys
-Version: 2.1.9
+Version: 2.2.0
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
 License: NON-COMMERCIAL

{django_microsys-2.1.9 → django_microsys-2.2.0}/django_microsys.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-microsys
-Version: 2.1.9
+Version: 2.2.0
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
 License: NON-COMMERCIAL

{django_microsys-2.1.9 → django_microsys-2.2.0}/django_microsys.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ microsys/context_processors.py
 microsys/discovery.py
 microsys/fetcher.py
 microsys/filters.py
+microsys/fonts.py
 microsys/forms.py
 microsys/guards.py
 microsys/managers.py
@@ -49,6 +50,7 @@ microsys/migrations/0001_initial.py
 microsys/migrations/0002_public_registration.py
 microsys/migrations/0003_public_root_split.py
 microsys/migrations/0004_client_ip_and_trusted_devices.py
+microsys/migrations/0005_systemsettings_allow_user_font_override_and_more.py
 microsys/migrations/__init__.py
 microsys/scaffold_templates/app/README.md.tmpl
 microsys/scaffold_templates/app/__init__.py.tmpl
@@ -108,6 +110,13 @@ 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/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
@@ -123,7 +132,6 @@ microsys/static/microsys/helpers/scan_link/js/main.js
 microsys/static/microsys/helpers/scan_link/js/scan_button.js
 microsys/static/microsys/helpers/wizard/js/main.js
 microsys/static/microsys/language/css/main.css
-microsys/static/microsys/language/fonts/TwemojiCountryFlags.woff2
 microsys/static/microsys/language/js/main.js
 microsys/static/microsys/language/js/translations.js
 microsys/static/microsys/main/css/buttons.css
@@ -137,9 +145,6 @@ microsys/static/microsys/main/css/system_setup.css
 microsys/static/microsys/main/css/tables.css
 microsys/static/microsys/main/css/template_cleanup.css
 microsys/static/microsys/main/css/titlebar.css
-microsys/static/microsys/main/fonts/Shabwa-Bold.woff2
-microsys/static/microsys/main/fonts/Shabwa-Medium.woff2
-microsys/static/microsys/main/fonts/Shabwa.woff2
 microsys/static/microsys/main/js/base_head.js
 microsys/static/microsys/main/js/base_runtime.js
 microsys/static/microsys/main/js/options.js
@@ -200,7 +205,10 @@ microsys/templates/microsys/helpers/dynamic_modal_detail.html
 microsys/templates/microsys/helpers/dynamic_modal_form.html
 microsys/templates/microsys/helpers/dynamic_modal_list.html
 microsys/templates/microsys/helpers/micro_context_menu.html
+microsys/templates/microsys/includes/font_previews.html
+microsys/templates/microsys/includes/font_settings_matrix.html
 microsys/templates/microsys/includes/language_catalog_editor.html
+microsys/templates/microsys/includes/language_fonts_editor.html
 microsys/templates/microsys/includes/language_previews.html
 microsys/templates/microsys/includes/options.html
 microsys/templates/microsys/includes/sidebar_builder.html

django_microsys-2.2.0/microsys/VERSION

@@ -0,0 +1 @@
+2.2.0

{django_microsys-2.1.9 → django_microsys-2.2.0}/microsys/context_processors.py

@@ -177,7 +177,7 @@ def microsys_context(request):
     context = {}
 
     # 1. Branding / App Config
-    from .utils import build_config_groups, get_system_config
+    from .utils import build_config_groups, get_system_config, normalize_allowed_fonts
     final_config = get_system_config()
 
     # 4. Language / i18n (resolved BEFORE branding overrides so we know current_lang)
@@ -342,7 +342,34 @@ def microsys_context(request):
         final_config,
         context['titlebar'],
     )
-
+    # 8. Font Resolution
+    from .fonts import generate_font_face_css, get_builtin_fonts
+    allowed_fonts = normalize_allowed_fonts(final_config.get('allowed_fonts'))
+    context['font_face_css'] = generate_font_face_css(allowed_fonts)
+    
+    allow_user_font_override = bool(final_config.get('allow_user_font_override', True))
+    default_fonts_by_lang = final_config.get('default_fonts', {})
+    
+    active_font = None
+    if allow_user_font_override:
+        active_font = user_prefs.get('font')
+    
+    if not active_font or active_font not in allowed_fonts:
+        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
+    if active_font not in allowed_fonts and allowed_fonts:
+        active_font = allowed_fonts[0]
+    elif not active_font:
+        active_font = 'shabwa'
+        
+    context['active_font'] = active_font
+    context['font_picker_enabled'] = bool(allow_user_font_override and len(allowed_fonts) > 1)
+    
     return context
 
 def clear_sidebar_cache():

django_microsys-2.2.0/microsys/fonts.py

@@ -0,0 +1,72 @@
+from functools import lru_cache
+from django.conf import settings
+from django.templatetags.static import static
+
+# 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',
+        'label': 'Cairo',
+        'variants': [
+            {'weight': 400, 'path': 'microsys/fonts/cairo-regular.woff2'},
+            {'weight': 600, 'path': 'microsys/fonts/cairo-medium.woff2'},
+            {'weight': 800, 'path': 'microsys/fonts/cairo-bold.woff2'},
+        ]
+    },
+)
+
+@lru_cache(maxsize=1)
+def get_builtin_fonts():
+    """Returns the list of hardcoded fonts available in the package."""
+    return _FONT_REGISTRY
+
+def get_font_choices():
+    """Returns a tuple of (slug, label) for form fields."""
+    return tuple((f['slug'], f['label']) for f in _FONT_REGISTRY)
+
+def get_font_by_slug(slug):
+    """Returns the font configuration dict for a given slug."""
+    for font in _FONT_REGISTRY:
+        if font['slug'] == slug:
+            return font
+    return None
+
+def generate_font_face_css(allowed_fonts=None):
+    """
+    Generates the @font-face CSS block for all allowed fonts.
+    This can be injected into the base template.
+    """
+    fonts_to_load = []
+    if allowed_fonts:
+        for slug in allowed_fonts:
+            font = get_font_by_slug(slug)
+            if font:
+                fonts_to_load.append(font)
+    else:
+        fonts_to_load = _FONT_REGISTRY
+
+    css_lines = []
+    for font in fonts_to_load:
+        for variant in font['variants']:
+            # We use static() to resolve the path correctly
+            url = static(variant['path'])
+            css_lines.append(f"@font-face {{")
+            css_lines.append(f"    font-family: '{font['family']}';")
+            css_lines.append(f"    font-weight: {variant['weight']};")
+            css_lines.append(f"    font-style: normal;")
+            css_lines.append(f"    src: url('{url}') format('woff2');")
+            css_lines.append(f"    font-display: swap;")
+            css_lines.append(f"}}")
+    
+    return "\n".join(css_lines)

{django_microsys-2.1.9 → django_microsys-2.2.0}/microsys/forms.py

@@ -73,12 +73,15 @@ from .utils import (
     normalize_sidebar_behavior,
     normalize_system_names,
     normalize_titlebar_config,
+    normalize_allowed_fonts,
 )
 from .widgets import MicrosysChoiceSelectorWidget
 
 User = get_user_model()
 
 THEME_CHOICES = get_theme_choices()
+from .fonts import get_font_choices
+FONT_CHOICES = get_font_choices()
 PERMISSION_UI_EXCLUDED_APP_LABELS = [
     'admin',
     'contenttypes',
@@ -1456,6 +1459,18 @@ class SystemSettingsForm(forms.ModelForm):
         required=False,
         initial=True,
     )
+    allowed_fonts = forms.MultipleChoiceField(
+        required=False,
+        choices=FONT_CHOICES,
+    )
+    allow_user_font_override = forms.BooleanField(
+        required=False,
+        initial=True,
+    )
+    default_fonts = forms.CharField(
+        widget=forms.HiddenInput(),
+        required=False,
+    )
     default_table_density = forms.ChoiceField(
         required=True,
         choices=TABLE_DENSITY_CHOICES,
@@ -1629,6 +1644,9 @@ class SystemSettingsForm(forms.ModelForm):
             'default_theme',
             'allowed_themes',
             'allow_user_theme_override',
+            'allowed_fonts',
+            'allow_user_font_override',
+            'default_fonts',
             'allow_user_language_override',
             'default_table_density',
             'email_2fa',
@@ -1665,7 +1683,7 @@ class SystemSettingsForm(forms.ModelForm):
                 parsed_step = int(raw_step)
             except (TypeError, ValueError):
                 parsed_step = None
-            if parsed_step in (0, 1, 2, 3, 4):
+            if parsed_step in (0, 1, 2, 3, 4, 5):
                 self.single_step_mode = True
                 self.single_step_index = parsed_step
 
@@ -1748,11 +1766,21 @@ class SystemSettingsForm(forms.ModelForm):
             'help_sys_allow_user_theme_override',
             'Allow users to switch between the allowed themes at runtime from Options and the sidebar toolbar.',
         )
-        self.fields['allow_user_language_override'].label = s.get('form_sys_allow_user_language_override', 'Allow user language override')
         self.fields['allow_user_language_override'].help_text = s.get(
             'help_sys_allow_user_language_override',
             'Allow users to change their display language from Options. When disabled, the system default language is enforced.',
         )
+        self.fields['allowed_fonts'].label = s.get('form_sys_allowed_fonts', 'Allowed fonts')
+        self.fields['allowed_fonts'].help_text = s.get(
+            'help_sys_allowed_fonts',
+            'Choose which fonts are available in this project. The default fonts for each language must remain enabled.',
+        )
+        self.fields['allow_user_font_override'].label = s.get('form_sys_allow_user_font_override', 'Allow user font override')
+        self.fields['allow_user_font_override'].help_text = s.get(
+            'help_sys_allow_user_font_override',
+            'Allow users to switch between the allowed fonts at runtime from Options.',
+        )
+        self.fields['default_fonts'].label = s.get('form_sys_default_fonts', 'Default fonts by language')
         self.fields['default_table_density'].label = s.get('form_sys_default_table_density', "Default Table Density")
         self.fields['default_table_density'].help_text = s.get(
             'help_sys_default_table_density',
@@ -2136,6 +2164,23 @@ class SystemSettingsForm(forms.ModelForm):
             if (not getattr(self.instance, 'pk', None) and not getattr(self.instance, 'is_configured', False))
             else getattr(self.instance, 'allow_user_theme_override', config.get('allow_user_theme_override', True))
         )
+        self.initial['allow_user_font_override'] = bool(
+            config.get('allow_user_font_override', True)
+            if (not getattr(self.instance, 'pk', None) and not getattr(self.instance, 'is_configured', False))
+            else getattr(self.instance, 'allow_user_font_override', config.get('allow_user_font_override', True))
+        )
+        initial_allowed_fonts = normalize_allowed_fonts(
+            (
+                config.get('allowed_fonts')
+                if (not getattr(self.instance, 'pk', None) and not getattr(self.instance, 'is_configured', False))
+                else getattr(self.instance, 'allowed_fonts', None)
+            ) or config.get('allowed_fonts')
+        )
+        self.initial['allowed_fonts'] = list(initial_allowed_fonts)
+        instance_default_fonts = getattr(self.instance, 'default_fonts', {}) or {}
+        if not instance_default_fonts:
+             instance_default_fonts = config.get('default_fonts', {})
+        self.initial['default_fonts'] = _json_dump(instance_default_fonts, ensure_ascii=False)
         self.initial['allow_user_language_override'] = bool(
             config.get('allow_user_language_override', True)
             if (not getattr(self.instance, 'pk', None) and not getattr(self.instance, 'is_configured', False))
@@ -2267,12 +2312,12 @@ class SystemSettingsForm(forms.ModelForm):
             sidebar_config['home_url_name'] = None
             self.initial['sidebar_config'] = _json_dump(sidebar_config, ensure_ascii=False)
 
-        try:
-            initial_sidebar_config = json.loads(self.initial.get('sidebar_config') or '{}')
-        except (TypeError, ValueError):
-            initial_sidebar_config = {}
-        if not isinstance(initial_sidebar_config, dict):
-            initial_sidebar_config = {}
+        initial_sidebar_config = self.initial.get('sidebar_config') or {}
+        if isinstance(initial_sidebar_config, str):
+            try:
+                initial_sidebar_config = json.loads(initial_sidebar_config)
+            except (TypeError, ValueError, json.JSONDecodeError):
+                initial_sidebar_config = {}
 
         self.initial['sidebar_enabled'] = bool(initial_sidebar_config.get('enabled', True))
         self.initial['sidebar_enable_reorder'] = bool(initial_sidebar_config.get('enable_reorder', True))
@@ -2329,26 +2374,32 @@ class SystemSettingsForm(forms.ModelForm):
         self.fields['public_root_url_discovered'].widget.option_meta = home_url_option_meta
         self.initial['public_root_url_discovered'] = current_public_root_url if current_public_root_url in seen_home_urls else ''
 
-        try:
-            initial_languages = json.loads(self.initial.get('languages') or '{}')
-        except (TypeError, ValueError):
-            initial_languages = {}
+        initial_languages = self.initial.get('languages') or {}
+        if isinstance(initial_languages, str):
+            try:
+                initial_languages = json.loads(initial_languages)
+            except (TypeError, ValueError, json.JSONDecodeError):
+                initial_languages = {}
         current_languages = normalize_language_catalog(initial_languages)
         self.initial['languages'] = _json_dump(current_languages, ensure_ascii=False)
         if self.initial.get('default_language') not in current_languages:
             self.initial['default_language'] = 'en' if 'en' in current_languages else next(iter(current_languages), 'en')
 
-        try:
-            initial_system_names = json.loads(self.initial.get('system_names') or '{}')
-        except (TypeError, ValueError):
-            initial_system_names = {}
+        initial_system_names = self.initial.get('system_names') or {}
+        if isinstance(initial_system_names, str):
+            try:
+                initial_system_names = json.loads(initial_system_names)
+            except (TypeError, ValueError, json.JSONDecodeError):
+                initial_system_names = {}
         initial_system_names = normalize_system_names(initial_system_names)
         self.initial['system_names'] = _json_dump(initial_system_names, ensure_ascii=False)
 
-        try:
-            initial_translation_overrides = json.loads(self.initial.get('translations_override') or '{}')
-        except (TypeError, ValueError):
-            initial_translation_overrides = {}
+        initial_translation_overrides = self.initial.get('translations_override') or {}
+        if isinstance(initial_translation_overrides, str):
+            try:
+                initial_translation_overrides = json.loads(initial_translation_overrides)
+            except (TypeError, ValueError, json.JSONDecodeError):
+                initial_translation_overrides = {}
         if not isinstance(initial_translation_overrides, dict):
             initial_translation_overrides = {}
         suggested_languages = [
@@ -2410,13 +2461,45 @@ class SystemSettingsForm(forms.ModelForm):
                 'picker_mode': 'setup',
                 'input_id': 'id_default_theme',
                 'allowed_input_name': 'allowed_themes',
-                'allowed_themes': set(self.initial.get('allowed_themes', [])),
+                'allowed_themes': set(self.initial.get('allowed_themes') if isinstance(self.initial.get('allowed_themes'), (list, tuple, set)) else []),
                 'MS_TRANS': s,
                 'MICROSYS_THEMES': get_theme_options(s),
                 'label': self.fields['default_theme'].label,
                 'help_text': self.fields['allowed_themes'].help_text,
             },
         )
+        
+        from .fonts import get_builtin_fonts
+        self.font_picker_html = render_to_string(
+            'microsys/includes/font_settings_matrix.html',
+            {
+                'picker_mode': 'setup',
+                'input_id': 'id_allowed_fonts',
+                'allowed_input_name': 'allowed_fonts',
+                'allowed_fonts': set(self.initial.get('allowed_fonts') if isinstance(self.initial.get('allowed_fonts'), (list, tuple, set)) else []),
+                'MS_TRANS': s,
+                'MICROSYS_FONTS': get_builtin_fonts(),
+                'label': self.fields['allowed_fonts'].label,
+                'help_text': self.fields['allowed_fonts'].help_text,
+            },
+        )
+        
+        default_fonts_data = self.initial.get('default_fonts') or {}
+        if isinstance(default_fonts_data, str):
+            try:
+                default_fonts_data = json.loads(default_fonts_data)
+            except (TypeError, ValueError, json.JSONDecodeError):
+                default_fonts_data = {}
+
+        self.language_fonts_editor_html = render_to_string(
+            'microsys/includes/language_fonts_editor.html',
+            {
+                'current_languages': current_languages,
+                'default_fonts': default_fonts_data,
+                'MICROSYS_FONTS': get_builtin_fonts(),
+                'MS_TRANS': s,
+            },
+        )
 
         self.sidebar_builder_html = render_to_string(
             'microsys/includes/sidebar_builder.html',
@@ -2424,7 +2507,7 @@ class SystemSettingsForm(forms.ModelForm):
                 'sidebar_catalog': self.sidebar_catalog,
                 'sidebar_catalog_json': _json_dump(self.sidebar_catalog, ensure_ascii=False),
                 'sidebar_catalog_fallback_json': _json_dump(self.sidebar_catalog_fallback, ensure_ascii=False),
-                'sidebar_config_json': self.initial.get('sidebar_config', '{}'),
+                'sidebar_config_json': _json_dump(self.initial.get('sidebar_config', {}), ensure_ascii=False),
                 'mode': self.mode,
                 'MS_TRANS': s,
             },
@@ -2664,17 +2747,7 @@ class SystemSettingsForm(forms.ModelForm):
                 css_class=_step_css_class(3),
             ),
             Div(
-                HTML(f"<div class='mb-3'><span class='badge rounded-pill text-bg-primary'>{s.get('system_setup_step5', 'Step 5: Appearance')}</span></div>"),
-                Row(
-                    Div(
-                        HTML(self.theme_picker_html),
-                        Field('default_theme'),
-                        css_class='mb-3'
-                    ),
-                ),
-                Row(
-                    build_settings_toggle_field(self, 'allow_user_theme_override', css_class='col-12')
-                ),
+                HTML(f"<div class='mb-3'><span class='badge rounded-pill text-bg-primary'>{s.get('system_setup_step5', 'Step 5: UI & Layout')}</span></div>"),
                 HTML(f"<h6 class='fw-bold my-3'>{s.get('tables_settings_title', 'Tables Settings')}</h6>"),
                 Row(
                     Div(Field('default_table_density'), css_class='col'),
@@ -2700,6 +2773,26 @@ class SystemSettingsForm(forms.ModelForm):
                 ),
                 css_class=_step_css_class(4),
             ),
+            Div(
+                HTML(f"<div class='mb-3'><span class='badge rounded-pill text-bg-primary'>{s.get('system_setup_step6', 'Step 6: Appearance')}</span></div>"),
+                Row(
+                    Div(
+                        HTML(self.theme_picker_html),
+                        Field('default_theme'),
+                        css_class='mb-3'
+                    ),
+                ),
+                Row(
+                    build_settings_toggle_field(self, 'allow_user_theme_override', css_class='col-12')
+                ),
+                HTML(f"<h6 class='fw-bold my-3'>{s.get('typography_settings_title', 'Typography Settings')}</h6>"),
+                HTML(self.font_picker_html),
+                # Field('allowed_fonts'),
+                build_settings_toggle_field(self, 'allow_user_font_override', css_class='col-12 mt-2'),
+                HTML(self.language_fonts_editor_html),
+                Field('default_fonts'),
+                css_class=_step_css_class(5),
+            ),
             FormActions(
                 HTML(
                     f"<div class='d-flex flex-wrap justify-content-end align-items-center gap-2 mt-4 ms-setup-wizard-actions' dir='{_get_ui_direction()}'>"
@@ -2772,6 +2865,24 @@ class SystemSettingsForm(forms.ModelForm):
     def clean_default_language(self):
         return str(self.cleaned_data.get('default_language') or 'en').strip().lower().replace('_', '-')
 
+    def clean_allowed_fonts(self):
+        data = self.cleaned_data.get('allowed_fonts')
+        if not data:
+            return []
+        return list(data)
+
+    def clean_default_fonts(self):
+        data = self.cleaned_data.get('default_fonts')
+        if not data:
+            return {}
+        try:
+            parsed = json.loads(data) if isinstance(data, str) else data
+            if not isinstance(parsed, dict):
+                return {}
+            return parsed
+        except json.JSONDecodeError:
+            return {}
+
     def clean_default_theme(self):
         value = self.cleaned_data.get('default_theme') or 'light'
         if not is_valid_theme(value):
@@ -3152,6 +3263,9 @@ class SystemSettingsForm(forms.ModelForm):
         instance.translations_override = self.cleaned_data.get('translations_override', {})
         instance.allowed_themes = self.cleaned_data.get('allowed_themes', list(normalize_allowed_themes()))
         instance.allow_user_theme_override = bool(self.cleaned_data.get('allow_user_theme_override', True))
+        instance.allowed_fonts = self.cleaned_data.get('allowed_fonts', [])
+        instance.allow_user_font_override = bool(self.cleaned_data.get('allow_user_font_override', True))
+        instance.default_fonts = self.cleaned_data.get('default_fonts', {})
         instance.allow_user_language_override = bool(self.cleaned_data.get('allow_user_language_override', True))
         instance.client_ip_config = self.cleaned_data.get('client_ip_config', default_client_ip_config())
         instance.titlebar_config = self.cleaned_data.get('titlebar_config', default_titlebar_config())

django_microsys-2.2.0/microsys/migrations/0005_systemsettings_allow_user_font_override_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 6.0.5 on 2026-05-16 09:39
+
+import microsys.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('microsys', '0004_client_ip_and_trusted_devices'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='systemsettings',
+            name='allow_user_font_override',
+            field=models.BooleanField(default=True, verbose_name='Allow User Font Override'),
+        ),
+        migrations.AddField(
+            model_name='systemsettings',
+            name='allowed_fonts',
+            field=models.JSONField(blank=True, default=microsys.models.default_allowed_fonts, verbose_name='Allowed Fonts'),
+        ),
+        migrations.AddField(
+            model_name='systemsettings',
+            name='default_fonts',
+            field=models.JSONField(blank=True, default=dict, verbose_name='Default Fonts by Language'),
+        ),
+    ]

{django_microsys-2.1.9 → django_microsys-2.2.0}/microsys/models.py

@@ -28,6 +28,11 @@ from datetime import timedelta
 from PIL import Image
 
 
+def default_allowed_fonts():
+    from .fonts import get_builtin_fonts
+    return [f['slug'] for f in get_builtin_fonts()]
+
+
 def default_allowed_themes():
     from .themes import get_theme_names
     return list(get_theme_names())
@@ -144,6 +149,12 @@ class SingletonModel(models.Model):
                     obj.registration_activation_mode = config.get('registration_activation_mode')
                 if hasattr(obj, 'registration_throttle_enabled') and 'registration_throttle_enabled' in config:
                     obj.registration_throttle_enabled = bool(config.get('registration_throttle_enabled'))
+                if hasattr(obj, 'allowed_fonts') and isinstance(config.get('allowed_fonts'), (list, tuple, set)):
+                    obj.allowed_fonts = list(config.get('allowed_fonts'))
+                if hasattr(obj, 'default_fonts') and isinstance(config.get('default_fonts'), dict):
+                    obj.default_fonts = config.get('default_fonts')
+                if hasattr(obj, 'allow_user_font_override') and 'allow_user_font_override' in config:
+                    obj.allow_user_font_override = bool(config.get('allow_user_font_override'))
                 obj.save()
             cache.set(cls.__name__, obj, timeout=86400)
         return obj
@@ -166,6 +177,9 @@ class SystemSettings(SingletonModel):
     )
     allowed_themes = models.JSONField(default=default_allowed_themes, blank=True, verbose_name="Allowed Themes")
     allow_user_theme_override = models.BooleanField(default=True, verbose_name="Allow User Theme Override")
+    allowed_fonts = models.JSONField(default=default_allowed_fonts, blank=True, verbose_name="Allowed Fonts")
+    default_fonts = models.JSONField(default=dict, blank=True, verbose_name="Default Fonts by Language")
+    allow_user_font_override = models.BooleanField(default=True, verbose_name="Allow User Font Override")
     allow_user_language_override = models.BooleanField(default=True, verbose_name="Allow User Language Override")
     home_url = models.CharField(max_length=255, default=DEFAULT_HOME_URL, verbose_name="Home URL")
     is_configured = models.BooleanField(default=False, verbose_name="Is Configured")
@@ -617,27 +631,13 @@ class UserActivityLog(ScopedModel):
         """Auto-resolve related object for dynamic modal detail view."""
         related_object = None
         if self.model_name and self.object_id:
+            from .utils import resolve_model_by_name
             try:
-                target_model = None
-                if '.' in self.model_name:
-                    try:
-                        target_model = apps.get_model(self.model_name)
-                    except LookupError:
-                        pass
-                if not target_model:
-                    import unicodedata
-                    def normalize(s):
-                        return unicodedata.normalize('NFKD', s).casefold() if s else ""
-                    log_model_norm = normalize(self.model_name)
-                    for model in apps.get_models():
-                        if normalize(model._meta.verbose_name) == log_model_norm or \
-                           normalize(model._meta.object_name) == log_model_norm:
-                            target_model = model
-                            break
+                target_model = resolve_model_by_name(self.model_name)
                 if target_model:
                     try:
                         related_object = target_model._default_manager.get(pk=self.object_id)
-                    except target_model.DoesNotExist:
+                    except (target_model.DoesNotExist, ValueError, TypeError):
                         pass
             except Exception:
                 pass

{django_microsys-2.1.9 → django_microsys-2.2.0}/microsys/static/microsys/language/css/main.css

@@ -73,7 +73,7 @@
 @font-face {
     font-family: 'Twemoji Country Flags';
     unicode-range: U+1F1E6-1F1FF, U+1F3F4, U+E0062-E0063, U+E0065-E0067, U+E006C, U+E006E, U+E0073-E0074, U+E0077, U+E007F;
-    src: url('../fonts/TwemojiCountryFlags.woff2') format('woff2');
+    src: url('../../fonts/TwemojiCountryFlags.woff2') format('woff2');
     font-display: swap;
 }