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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_microsys
-Version: 2.1.8
+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
@@ -137,7 +137,7 @@ For a fuller setup path, prefix-mount guidance, and first-launch expectations, u
 - Onboarding and runtime configuration:
   first-launch setup wizard, Options view, runtime System Settings modal, source-tabbed translation overrides, setup import/export, language/theme defaults, and a global Home destination.
 - User and security operations:
-  interactive user wizard, grouped translated permissions, four-tier staff authorization (superuser, Global Staff, Central Staff, Scoped Staff), permission-based sidebar visibility, profile management, multiple 2FA flows, backup codes, and runtime preference persistence.
+  interactive user wizard, grouped translated permissions, four-tier staff authorization (superuser, Global Staff, Central Staff, Scoped Staff), permission-based sidebar visibility, profile management, multiple 2FA flows (App, Email, Backup), trusted device tracking for 30 days, and runtime preference persistence.
 - Generic CRUD infrastructure:
   dynamic sections, AJAX-driven modal CRUD, automatic form/table/filter discovery, context-menu actions, and reusable event dispatch.
 - Navigation and UI infrastructure:
@@ -145,7 +145,7 @@ For a fuller setup path, prefix-mount guidance, and first-launch expectations, u
 - Data movement and productivity helpers:
   universal file download, Excel export, smart autofill, sticky-form cloning, and generic list/filter helpers.
 - Audit and governance:
-  signal-based activity logging, diff capture, masked sensitive fields, deduplicated entries, download/export logging, and scoped visibility.
+  signal-based activity logging with configurable IP resolution (direct/proxy/header), diff capture, masked sensitive fields, deduplicated entries, download/export logging, and scoped visibility.
 - Optional SSO:
   `django-microsys-sso` and `django-microsys-sso-client` live as separate optional packages for OIDC provider/client deployments without changing core Microsys runtime behavior.
 - Framework-level automation:

{django_microsys-2.1.8 → django_microsys-2.2.0}/README.md

@@ -103,7 +103,7 @@ For a fuller setup path, prefix-mount guidance, and first-launch expectations, u
 - Onboarding and runtime configuration:
   first-launch setup wizard, Options view, runtime System Settings modal, source-tabbed translation overrides, setup import/export, language/theme defaults, and a global Home destination.
 - User and security operations:
-  interactive user wizard, grouped translated permissions, four-tier staff authorization (superuser, Global Staff, Central Staff, Scoped Staff), permission-based sidebar visibility, profile management, multiple 2FA flows, backup codes, and runtime preference persistence.
+  interactive user wizard, grouped translated permissions, four-tier staff authorization (superuser, Global Staff, Central Staff, Scoped Staff), permission-based sidebar visibility, profile management, multiple 2FA flows (App, Email, Backup), trusted device tracking for 30 days, and runtime preference persistence.
 - Generic CRUD infrastructure:
   dynamic sections, AJAX-driven modal CRUD, automatic form/table/filter discovery, context-menu actions, and reusable event dispatch.
 - Navigation and UI infrastructure:
@@ -111,7 +111,7 @@ For a fuller setup path, prefix-mount guidance, and first-launch expectations, u
 - Data movement and productivity helpers:
   universal file download, Excel export, smart autofill, sticky-form cloning, and generic list/filter helpers.
 - Audit and governance:
-  signal-based activity logging, diff capture, masked sensitive fields, deduplicated entries, download/export logging, and scoped visibility.
+  signal-based activity logging with configurable IP resolution (direct/proxy/header), diff capture, masked sensitive fields, deduplicated entries, download/export logging, and scoped visibility.
 - Optional SSO:
   `django-microsys-sso` and `django-microsys-sso-client` live as separate optional packages for OIDC provider/client deployments without changing core Microsys runtime behavior.
 - Framework-level automation:

{django_microsys-2.1.8 → 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.8
+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
@@ -137,7 +137,7 @@ For a fuller setup path, prefix-mount guidance, and first-launch expectations, u
 - Onboarding and runtime configuration:
   first-launch setup wizard, Options view, runtime System Settings modal, source-tabbed translation overrides, setup import/export, language/theme defaults, and a global Home destination.
 - User and security operations:
-  interactive user wizard, grouped translated permissions, four-tier staff authorization (superuser, Global Staff, Central Staff, Scoped Staff), permission-based sidebar visibility, profile management, multiple 2FA flows, backup codes, and runtime preference persistence.
+  interactive user wizard, grouped translated permissions, four-tier staff authorization (superuser, Global Staff, Central Staff, Scoped Staff), permission-based sidebar visibility, profile management, multiple 2FA flows (App, Email, Backup), trusted device tracking for 30 days, and runtime preference persistence.
 - Generic CRUD infrastructure:
   dynamic sections, AJAX-driven modal CRUD, automatic form/table/filter discovery, context-menu actions, and reusable event dispatch.
 - Navigation and UI infrastructure:
@@ -145,7 +145,7 @@ For a fuller setup path, prefix-mount guidance, and first-launch expectations, u
 - Data movement and productivity helpers:
   universal file download, Excel export, smart autofill, sticky-form cloning, and generic list/filter helpers.
 - Audit and governance:
-  signal-based activity logging, diff capture, masked sensitive fields, deduplicated entries, download/export logging, and scoped visibility.
+  signal-based activity logging with configurable IP resolution (direct/proxy/header), diff capture, masked sensitive fields, deduplicated entries, download/export logging, and scoped visibility.
 - Optional SSO:
   `django-microsys-sso` and `django-microsys-sso-client` live as separate optional packages for OIDC provider/client deployments without changing core Microsys runtime behavior.
 - Framework-level automation:

{django_microsys-2.1.8 → 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
@@ -48,6 +49,8 @@ microsys/management/commands/seed_activity_log.py
 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
@@ -107,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
@@ -122,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
@@ -136,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
@@ -199,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.8 → django_microsys-2.2.0}/microsys/context_processors.py

@@ -3,6 +3,7 @@ from urllib.parse import urlsplit
 from .constants import DEFAULT_TABLE_DENSITY, TABLE_DENSITY_CHOICES, TABLE_DENSITY_VALUES
 from .utils import (
     get_effective_allowed_themes,
+    get_user_management_tier_state_for_user,
     has_section_models,
     is_scope_enabled,
     normalize_sidebar_behavior,
@@ -176,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)
@@ -232,6 +233,7 @@ def microsys_context(request):
     context['can_view_user_directory'] = user_can_view_user_directory(request.user)
     context['can_view_activity_log'] = user_can_view_activity_log(request.user)
     context['can_view_sections'] = user_has_section_view_permission(request.user)
+    context['current_user_management_tier'] = get_user_management_tier_state_for_user(request.user)
 
     # 3. User Preferences (for JS injection & server-side logic)
     user_prefs = {}
@@ -340,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)