micro-users 1.8.3__tar.gz → 1.9.0__tar.gz

{micro_users-1.8.3 → micro_users-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micro_users
-Version: 1.8.3
+Version: 1.9.0
 Summary: Arabic Django user management app with abstract user, permissions, and activity logging
 Home-page: https://github.com/debeski/micro-users
 Author: DeBeski
@@ -92,12 +92,27 @@ MIDDLEWARE = [
 ]
 ```
 
-3. Set custom user model in `settings.py`:
+3. Add Context Processor in `settings.py` (Optional, for `scope_enabled` variable in templates):
+```python
+TEMPLATES = [
+    {
+        # ...
+        'OPTIONS': {
+            'context_processors': [
+                # ...
+                'users.context_processors.scope_settings', # Add this line
+            ],
+        },
+    },
+]
+```
+
+4. Set custom user model in `settings.py`:
 ```python
 AUTH_USER_MODEL = 'users.CustomUser'
 ```
 
-4. Include URLs in your main project folder `urls.py`:
+5. Include URLs in your main project folder `urls.py`:
 ```python
 urlpatterns = [
     ...
@@ -105,7 +120,7 @@ urlpatterns = [
 ]
 ```
 
-5. Run migrations:
+6. Run migrations:
 ```bash
 python manage.py migrate users
 ```
@@ -168,21 +183,6 @@ users/
 ### Replacing Login Logo
 To replace the default login logo, simply place your own `login_logo.webp` image in your project's static directory at `static/img/login_logo.webp`.
 
-### Theme Configuration
-You can configure the login page colors by defining `MICRO_USERS_THEME` in your project's `settings.py`. This dictionary overrides the default CSS variables.
-
-```python
-MICRO_USERS_THEME = {
-    'right_bg': '#474745',
-    'left_bg': 'white',
-    'selection_bg': '#dbdbdb',
-    'gradient_start': '#a2a2a7',
-    'gradient_end': '#474745',
-    # Additional keys supported:
-    # 'selection_moz_bg', 'left_shadow', 'right_shadow', 'right_text',
-    # 'label_color', 'input_text', 'submit_color', 'submit_focus', 'submit_active'
-}
-```
 
 ## Version History
 
@@ -215,3 +215,10 @@ MICRO_USERS_THEME = {
 | v1.8.1   | • **UI Refinement**: Swapped `Email` and `Phone` positions across all forms, tables, and detail views<br>• **Field Logic**: Set `Email` and `Phone` as optional (not required) for all users<br>• **Security**: Added `manage_staff` custom permission to restrict `is_staff` management to authorized managers only<br>• **Bug Fix**: Reserved `manage_staff` assignment power strictly for Superusers and fixed UI grouping for custom permissions |
 | v1.8.2   | • **Login UX**: Enhanced login flow with auto-focus on username and improved "Enter to Submit" handling |
 | v1.8.3   | • **CSP Compliance**: Added `nonce` attribute support to all inline and external script tags (Login, Permissions, Manage Users) for Content Security Policy compliance |
+| v1.8.4   | • **Strict CSP**: Refactored inline JS event handlers to use Event Listeners, fully resolving CSP violation errors |
+| v1.8.5   | • **Optional Scopes**: Added ability for Superusers to toggle Scope system ON/OFF via User Management interface |
+| v1.8.6   | • **Strict CSP Repair**: Fixed remaining inline event handlers in User Management pages (`manage_users`, `scope_form`) that were violating CSP directives, moving all logic to external `manage_users.js` |
+| v1.8.7   | • Fixed a couple of template tab title mismatches |
+| v1.8.8   | • Fixed a couple of template content title mismatches and classes |
+| v1.8.9   | • Fixed migrations |
+| v1.9.0   | • **UI Overhaul**: Unified all buttons, and clssses to conform to themes, rounded corners, and improved spacing |

{micro_users-1.8.3 → micro_users-1.9.0}/README.md

@@ -60,12 +60,27 @@ MIDDLEWARE = [
 ]
 ```
 
-3. Set custom user model in `settings.py`:
+3. Add Context Processor in `settings.py` (Optional, for `scope_enabled` variable in templates):
+```python
+TEMPLATES = [
+    {
+        # ...
+        'OPTIONS': {
+            'context_processors': [
+                # ...
+                'users.context_processors.scope_settings', # Add this line
+            ],
+        },
+    },
+]
+```
+
+4. Set custom user model in `settings.py`:
 ```python
 AUTH_USER_MODEL = 'users.CustomUser'
 ```
 
-4. Include URLs in your main project folder `urls.py`:
+5. Include URLs in your main project folder `urls.py`:
 ```python
 urlpatterns = [
     ...
@@ -73,7 +88,7 @@ urlpatterns = [
 ]
 ```
 
-5. Run migrations:
+6. Run migrations:
 ```bash
 python manage.py migrate users
 ```
@@ -136,21 +151,6 @@ users/
 ### Replacing Login Logo
 To replace the default login logo, simply place your own `login_logo.webp` image in your project's static directory at `static/img/login_logo.webp`.
 
-### Theme Configuration
-You can configure the login page colors by defining `MICRO_USERS_THEME` in your project's `settings.py`. This dictionary overrides the default CSS variables.
-
-```python
-MICRO_USERS_THEME = {
-    'right_bg': '#474745',
-    'left_bg': 'white',
-    'selection_bg': '#dbdbdb',
-    'gradient_start': '#a2a2a7',
-    'gradient_end': '#474745',
-    # Additional keys supported:
-    # 'selection_moz_bg', 'left_shadow', 'right_shadow', 'right_text',
-    # 'label_color', 'input_text', 'submit_color', 'submit_focus', 'submit_active'
-}
-```
 
 ## Version History
 
@@ -182,4 +182,11 @@ MICRO_USERS_THEME = {
 | v1.8.0   | • **Permissions UI**: Complete redesign with App/Model-based grouping and hierarchical checkboxes<br>• **Aesthetics**: Applied modern glassmorphism theme to permission cards with interactive toggles<br>• **Security**: Implemented 3-level security logic (GM, SM, User) and "invisible" Superuser protection<br>• **Foolproofing**: Added self-editing protection for staff and scope enforcement for managers<br>• **Localization**: Fully translated system auth labels and metadata to Arabic |
 | v1.8.1   | • **UI Refinement**: Swapped `Email` and `Phone` positions across all forms, tables, and detail views<br>• **Field Logic**: Set `Email` and `Phone` as optional (not required) for all users<br>• **Security**: Added `manage_staff` custom permission to restrict `is_staff` management to authorized managers only<br>• **Bug Fix**: Reserved `manage_staff` assignment power strictly for Superusers and fixed UI grouping for custom permissions |
 | v1.8.2   | • **Login UX**: Enhanced login flow with auto-focus on username and improved "Enter to Submit" handling |
-| v1.8.3   | • **CSP Compliance**: Added `nonce` attribute support to all inline and external script tags (Login, Permissions, Manage Users) for Content Security Policy compliance |
+| v1.8.3   | • **CSP Compliance**: Added `nonce` attribute support to all inline and external script tags (Login, Permissions, Manage Users) for Content Security Policy compliance |
+| v1.8.4   | • **Strict CSP**: Refactored inline JS event handlers to use Event Listeners, fully resolving CSP violation errors |
+| v1.8.5   | • **Optional Scopes**: Added ability for Superusers to toggle Scope system ON/OFF via User Management interface |
+| v1.8.6   | • **Strict CSP Repair**: Fixed remaining inline event handlers in User Management pages (`manage_users`, `scope_form`) that were violating CSP directives, moving all logic to external `manage_users.js` |
+| v1.8.7   | • Fixed a couple of template tab title mismatches |
+| v1.8.8   | • Fixed a couple of template content title mismatches and classes |
+| v1.8.9   | • Fixed migrations |
+| v1.9.0   | • **UI Overhaul**: Unified all buttons, and clssses to conform to themes, rounded corners, and improved spacing |

{micro_users-1.8.3 → micro_users-1.9.0}/micro_users.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micro-users
-Version: 1.8.3
+Version: 1.9.0
 Summary: Arabic Django user management app with abstract user, permissions, and activity logging
 Home-page: https://github.com/debeski/micro-users
 Author: DeBeski
@@ -92,12 +92,27 @@ MIDDLEWARE = [
 ]
 ```
 
-3. Set custom user model in `settings.py`:
+3. Add Context Processor in `settings.py` (Optional, for `scope_enabled` variable in templates):
+```python
+TEMPLATES = [
+    {
+        # ...
+        'OPTIONS': {
+            'context_processors': [
+                # ...
+                'users.context_processors.scope_settings', # Add this line
+            ],
+        },
+    },
+]
+```
+
+4. Set custom user model in `settings.py`:
 ```python
 AUTH_USER_MODEL = 'users.CustomUser'
 ```
 
-4. Include URLs in your main project folder `urls.py`:
+5. Include URLs in your main project folder `urls.py`:
 ```python
 urlpatterns = [
     ...
@@ -105,7 +120,7 @@ urlpatterns = [
 ]
 ```
 
-5. Run migrations:
+6. Run migrations:
 ```bash
 python manage.py migrate users
 ```
@@ -168,21 +183,6 @@ users/
 ### Replacing Login Logo
 To replace the default login logo, simply place your own `login_logo.webp` image in your project's static directory at `static/img/login_logo.webp`.
 
-### Theme Configuration
-You can configure the login page colors by defining `MICRO_USERS_THEME` in your project's `settings.py`. This dictionary overrides the default CSS variables.
-
-```python
-MICRO_USERS_THEME = {
-    'right_bg': '#474745',
-    'left_bg': 'white',
-    'selection_bg': '#dbdbdb',
-    'gradient_start': '#a2a2a7',
-    'gradient_end': '#474745',
-    # Additional keys supported:
-    # 'selection_moz_bg', 'left_shadow', 'right_shadow', 'right_text',
-    # 'label_color', 'input_text', 'submit_color', 'submit_focus', 'submit_active'
-}
-```
 
 ## Version History
 
@@ -215,3 +215,10 @@ MICRO_USERS_THEME = {
 | v1.8.1   | • **UI Refinement**: Swapped `Email` and `Phone` positions across all forms, tables, and detail views<br>• **Field Logic**: Set `Email` and `Phone` as optional (not required) for all users<br>• **Security**: Added `manage_staff` custom permission to restrict `is_staff` management to authorized managers only<br>• **Bug Fix**: Reserved `manage_staff` assignment power strictly for Superusers and fixed UI grouping for custom permissions |
 | v1.8.2   | • **Login UX**: Enhanced login flow with auto-focus on username and improved "Enter to Submit" handling |
 | v1.8.3   | • **CSP Compliance**: Added `nonce` attribute support to all inline and external script tags (Login, Permissions, Manage Users) for Content Security Policy compliance |
+| v1.8.4   | • **Strict CSP**: Refactored inline JS event handlers to use Event Listeners, fully resolving CSP violation errors |
+| v1.8.5   | • **Optional Scopes**: Added ability for Superusers to toggle Scope system ON/OFF via User Management interface |
+| v1.8.6   | • **Strict CSP Repair**: Fixed remaining inline event handlers in User Management pages (`manage_users`, `scope_form`) that were violating CSP directives, moving all logic to external `manage_users.js` |
+| v1.8.7   | • Fixed a couple of template tab title mismatches |
+| v1.8.8   | • Fixed a couple of template content title mismatches and classes |
+| v1.8.9   | • Fixed migrations |
+| v1.9.0   | • **UI Overhaul**: Unified all buttons, and clssses to conform to themes, rounded corners, and improved spacing |

{micro_users-1.8.3 → micro_users-1.9.0}/micro_users.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ micro_users.egg-info/top_level.txt
 users/__init__.py
 users/admin.py
 users/apps.py
+users/context_processors.py
 users/filters.py
 users/forms.py
 users/middleware.py
@@ -18,10 +19,11 @@ users/models.py
 users/signals.py
 users/tables.py
 users/urls.py
+users/utils.py
 users/views.py
 users/migrations/0001_initial.py
 users/migrations/0002_alter_useractivitylog_action.py
-users/migrations/0003_scope_alter_customuser_options_and_more.py
+users/migrations/0003_scope_scopesettings_alter_customuser_options_and_more.py
 users/migrations/__init__.py
 users/static/img/default_profile.webp
 users/static/img/login_logo.webp
@@ -31,6 +33,7 @@ users/static/users/css/permissions.css
 users/static/users/css/profile.css
 users/static/users/css/style.css
 users/static/users/js/login.js
+users/static/users/js/manage_users.js
 users/static/users/js/permissions.js
 users/templates/registration/login.html
 users/templates/users/manage_users.html

{micro_users-1.8.3 → micro_users-1.9.0}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "micro_users"
-version = "1.8.3"
+version = "1.9.0"
 description = "Arabic Django user management app with abstract user, permissions, and activity logging"
 readme = "README.md"
 requires-python = ">=3.11"

{micro_users-1.8.3 → micro_users-1.9.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="micro_users",
-    version="1.8.3",
+    version="1.9.0",
     author="DeBeski",
     author_email="debeski1@gmail.com",
     description="Arabic django user management app with abstract user, permissions, and activity logging",

micro_users-1.9.0/users/context_processors.py

@@ -0,0 +1,9 @@
+from .utils import is_scope_enabled
+
+def scope_settings(request):
+    """
+    Context processor to add scope settings to all templates.
+    """
+    return {
+        'scope_enabled': is_scope_enabled()
+    }

{micro_users-1.8.3 → micro_users-1.9.0}/users/filters.py

@@ -6,7 +6,7 @@ from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Row, Column, Field, HTML, Hidden
 from django.db.models import Q
 from django.apps import apps  # Import apps
-
+from users.utils import is_scope_enabled
 User = get_user_model()  # Use custom user model
 
 class UserFilter(django_filters.FilterSet):
@@ -34,8 +34,8 @@ class UserFilter(django_filters.FilterSet):
         self.form.helper.layout.append(
             Row(
                 Column(Field('keyword', placeholder="البحث"), css_class='form-group col-auto flex-fill'),
-                Column(HTML('<button type="submit" class="btn btn-secondary w-100"><i class="bi bi-search bi-font text-light me-2"></i>بحـــث</button>'), css_class='col-auto text-center'),
-                Column(HTML(f'{{% if request.GET and request.GET.keys|length > 1 %}} <a href="{clear_url}" class="btn btn-warning bi-font">clear</a> {{% endif %}}'), css_class='form-group col-auto text-center'),
+                Column(HTML('<button type="submit" class="btn btn-secondary rounded-pill w-100"><i class="bi bi-search bi-font text-light me-2"></i>بحـــث</button>'), css_class='col-auto text-center'),
+                Column(HTML(f'{{% if request.GET and request.GET.keys|length > 1 %}} <a href="{clear_url}" class="btn btn-warning rounded-pill bi-font">clear</a> {{% endif %}}'), css_class='form-group col-auto text-center'),
                 css_class='form-row'
             ),
         )
@@ -104,9 +104,9 @@ class UserActivityLogFilter(django_filters.FilterSet):
         row_fields = [
             Column(Field('keyword', placeholder="البحث"), css_class='form-group col-auto flex-fill'),
         ]
-        
-        if not (self.request and self.request.user.scope):
-             row_fields.append(Column(Field('scope', placeholder="النطاق", dir="rtl"), css_class='form-group col-auto'))
+        if is_scope_enabled():
+            if not (self.request and self.request.user.scope):
+                row_fields.append(Column(Field('scope', placeholder="النطاق", dir="rtl"), css_class='form-group col-auto'))
 
         # Prepare clear button URL with sort parameter if exists
         clear_url = '{% url "user_activity_log" %}'
@@ -122,8 +122,8 @@ class UserActivityLogFilter(django_filters.FilterSet):
                 ), 
                 css_class='col-auto flex-fill'
             ),
-            Column(HTML('<button type="submit" class="btn btn-secondary w-100"><i class="bi bi-search bi-font text-light me-2"></i>بحـــث</button>'), css_class='col-auto text-center'),
-            Column(HTML(f'{{% if request.GET and request.GET.keys|length > 1 %}} <a href="{clear_url}" class="btn btn-warning bi-font">clear</a> {{% endif %}}'), css_class='form-group col-auto text-center'),
+            Column(HTML('<button type="submit" class="btn btn-secondary rounded-pill w-100"><i class="bi bi-search bi-font text-light me-2"></i>بحـــث</button>'), css_class='col-auto text-center'),
+            Column(HTML(f'{{% if request.GET and request.GET.keys|length > 1 %}} <a href="{clear_url}" class="btn btn-warning rounded-pill bi-font">clear</a> {{% endif %}}'), css_class='form-group col-auto text-center'),
         ])
 
         self.form.helper.layout.append(Row(*row_fields, css_class='form-row'))

{micro_users-1.8.3 → micro_users-1.9.0}/users/forms.py

@@ -5,7 +5,7 @@ from django.contrib.auth.models import Permission as Permissions
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm, PasswordChangeForm, SetPasswordForm
 from django.contrib.auth import get_user_model
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Field, Div, HTML, Submit
+from crispy_forms.layout import Layout, Field, Div, HTML, Submit, Row
 from crispy_forms.bootstrap import FormActions
 from PIL import Image
 from django.core.exceptions import ValidationError
@@ -165,6 +165,12 @@ class CustomUserCreationForm(UserCreationForm):
             user_perms = self.user.user_permissions.all() | Permissions.objects.filter(group__user=self.user)
             self.fields['permissions'].queryset = self.fields['permissions'].queryset.filter(id__in=user_perms.values_list('id', flat=True))
         
+        ScopeSettings = apps.get_model('users', 'ScopeSettings')
+        if not ScopeSettings.load().is_enabled:
+            self.fields['scope'].disabled = True
+            self.fields['scope'].widget = forms.HiddenInput()
+            self.fields['scope'].required = False
+        
         if self.user and not self.user.is_superuser and self.user.scope:
             self.fields['scope'].initial = self.user.scope
             self.fields['scope'].disabled = True
@@ -187,14 +193,15 @@ class CustomUserCreationForm(UserCreationForm):
         self.fields["email"].label = "البريد الإلكتروني"
         self.fields["first_name"].label = "الاسم"
         self.fields["last_name"].label = "اللقب"
-        self.fields["is_staff"].label = "صلاحيات انشاء و تعديل المستخدمين"
+        self.fields["is_staff"].label = "صلاحيات انشاء و تعديل المستخدمين (مسؤول)"
         self.fields["password1"].label = "كلمة المرور"
         self.fields["password2"].label = "تأكيد كلمة المرور"
         self.fields["is_active"].label = "تفعيل الحساب"
 
         # Help Texts
-        self.fields["username"].help_text = "اسم المستخدم يجب أن يكون فريدًا، 50 حرفًا أو أقل. فقط حروف، أرقام و @ . + - _"
+        self.fields["username"].help_text = "اسم المستخدم يجب أن يكون فريدًا، 20 حرفًا أو أقل. فقط حروف، أرقام و @ . + - _"
         self.fields["email"].help_text = "أدخل عنوان البريد الإلكتروني الصحيح"
+        self.fields["phone"].help_text = "أدخل رقم الهاتف الصحيح بالصيغة الاتية 09XXXXXXXX"
         self.fields["is_staff"].help_text = "يحدد ما إذا كان بإمكان المستخدم الوصول إلى قسم ادارة المستخدمين."
         self.fields["is_active"].help_text = "يحدد ما إذا كان يجب اعتبار هذا الحساب نشطًا."
         self.fields["password1"].help_text = "كلمة المرور يجب ألا تكون مشابهة لمعلوماتك الشخصية، وأن تحتوي على 8 أحرف على الأقل، وألا تكون شائعة أو رقمية بالكامل.."
@@ -203,21 +210,21 @@ class CustomUserCreationForm(UserCreationForm):
         # Use Crispy Forms Layout helper
         self.helper = FormHelper()
         self.helper.layout = Layout(
-            "username",
-            "phone",
-            "password1",
-            "password2",
+            Row(Field("username", css_class="form-control")),            
+            Row(Field("password1", css_class="form-control")),
+            Row(Field("password2", css_class="form-control")),
             HTML("<hr>"),
-            Div(
-                Div(Field("first_name", css_class="col-md-6"), css_class="col-md-6"),
-                Div(Field("last_name", css_class="col-md-6"), css_class="col-md-6"),
+            Row(
+                Div(Field("first_name", css_class="form-control"), css_class="col-md-6"),
+                Div(Field("last_name", css_class="form-control"), css_class="col-md-6"),
                 css_class="row"
             ),
-            Div(
-                Div(Field("email", css_class="col-md-6"), css_class="col-md-6"),
-                Div(Field("scope", css_class="col-md-6"), css_class="col-md-6"),
+            Row(
+                Div(Field("phone", css_class="form-control"), css_class="col-md-6"),
+                Div(Field("email", css_class="form-control"), css_class="col-md-6"),
                 css_class="row"
             ),
+            Row(Field("scope", css_class="form-control")),
             HTML("<hr>"),
             Field("permissions", css_class="col-12"),
             "is_staff",
@@ -225,7 +232,7 @@ class CustomUserCreationForm(UserCreationForm):
             FormActions(
                 HTML(
                     """
-                    <button type="submit" class="btn btn-success">
+                    <button type="submit" class="btn btn-success rounded-pill">
                         <i class="bi bi-person-plus-fill text-light me-1 h4"></i>
                         إضافة
                     </button>
@@ -233,7 +240,7 @@ class CustomUserCreationForm(UserCreationForm):
                 ),
                 HTML(
                     """
-                    <a href="{% url 'manage_users' %}" class="btn btn-secondary">
+                    <a href="{% url 'manage_users' %}" class="btn btn-danger rounded-pill">
                         <i class="bi bi-arrow-return-left text-light me-1 h4"></i> إلغـــاء
                     </a>
                     """
@@ -288,11 +295,11 @@ class CustomUserChangeForm(UserChangeForm):
         self.fields["email"].label = "البريد الإلكتروني"
         self.fields["first_name"].label = "الاسم الاول"
         self.fields["last_name"].label = "اللقب"
-        self.fields["is_staff"].label = "صلاحيات انشاء و تعديل المستخدمين"
+        self.fields["is_staff"].label = "صلاحيات انشاء و تعديل المستخدمين (مسؤول)"
         self.fields["is_active"].label = "الحساب مفعل"
         
         # Help Texts
-        self.fields["username"].help_text = "اسم المستخدم يجب أن يكون فريدًا، 50 حرفًا أو أقل. فقط حروف، أرقام و @ . + - _"
+        self.fields["username"].help_text = "اسم المستخدم يجب أن يكون فريدًا، 20 حرفًا أو أقل. فقط حروف، أرقام و @ . + - _"
         self.fields["email"].help_text = "أدخل عنوان البريد الإلكتروني الصحيح"
         self.fields["is_staff"].help_text = "يحدد ما إذا كان بإمكان المستخدم الوصول إلى قسم ادارة المستخدمين."
         self.fields["is_active"].help_text = "يحدد ما إذا كان يجب اعتبار هذا الحساب نشطًا. قم بإلغاء تحديد هذا الخيار بدلاً من الحذف."
@@ -300,6 +307,12 @@ class CustomUserChangeForm(UserChangeForm):
         if user_instance:
             self.fields["permissions"].initial = user_instance.user_permissions.all()
 
+        ScopeSettings = apps.get_model('users', 'ScopeSettings')
+        if not ScopeSettings.load().is_enabled:
+            self.fields['scope'].disabled = True
+            self.fields['scope'].widget = forms.HiddenInput()
+            self.fields['scope'].required = False
+
         # --- Foolproofing & Role-based logic ---
         if self.user and not self.user.is_superuser:
             # 1. Self-Editing Protection (Prevents accidental demotion)
@@ -335,19 +348,19 @@ class CustomUserChangeForm(UserChangeForm):
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.helper.layout = Layout(
-            "username",
-            "phone",
+            Row(Field("username", css_class="form-control")),            
             HTML("<hr>"),
-            Div(
-                Div(Field("first_name", css_class="col-md-6"), css_class="col-md-6"),
-                Div(Field("last_name", css_class="col-md-6"), css_class="col-md-6"),
+            Row(
+                Div(Field("first_name", css_class="form-control"), css_class="col-md-6"),
+                Div(Field("last_name", css_class="form-control"), css_class="col-md-6"),
                 css_class="row"
             ),
-            Div(
-                Div(Field("email", css_class="col-md-6"), css_class="col-md-6"),
-                Div(Field("scope", css_class="col-md-6"), css_class="col-md-6"),
+            Row(
+                Div(Field("phone", css_class="form-control"), css_class="col-md-6"),
+                Div(Field("email", css_class="form-control"), css_class="col-md-6"),
                 css_class="row"
             ),
+            Row(Field("scope", css_class="form-control")),
             HTML("<hr>"),
             Field("permissions", css_class="col-12"),
             "is_staff",
@@ -355,7 +368,7 @@ class CustomUserChangeForm(UserChangeForm):
             FormActions(
                 HTML(
                     """
-                    <button type="submit" class="btn btn-success">
+                    <button type="submit" class="btn btn-success rounded-pill">
                         <i class="bi bi-person-plus-fill text-light me-1 h4"></i>
                         تحديث
                     </button>
@@ -363,14 +376,14 @@ class CustomUserChangeForm(UserChangeForm):
                 ),
                 HTML(
                     """
-                    <a href="{% url 'manage_users' %}" class="btn btn-secondary">
+                    <a href="{% url 'manage_users' %}" class="btn btn-danger rounded-pill">
                         <i class="bi bi-arrow-return-left text-light me-1 h4"></i> إلغـــاء
                     </a>
                     """
                 ),
                 HTML(
                     """
-                    <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#resetPasswordModal">
+                    <button type="button" class="btn btn-warning rounded-pill" data-bs-toggle="modal" data-bs-target="#resetPasswordModal">
                         <i class="bi bi-key-fill text-light me-1 h4"></i> إعادة تعيين كلمة المرور
                     </button>
                     """
@@ -405,7 +418,7 @@ class ResetPasswordForm(SetPasswordForm):
                 Field('new_password2', css_class='col-md-12'),
                 css_class='row'
             ),
-            Submit('submit', 'تغيير كلمة المرور', css_class='btn btn-primary'),
+            Submit('submit', 'تغيير كلمة المرور', css_class='btn btn-danger rounded-pill'),
         )
 
     def save(self, commit=True):

micro_users-1.8.3/users/migrations/0003_scope_alter_customuser_options_and_more.py → micro_users-1.9.0/users/migrations/0003_scope_scopesettings_alter_customuser_options_and_more.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.8 on 2026-01-27 23:46
+# Generated by Django 5.2.8 on 2026-02-02 20:03
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -22,6 +22,17 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'النطاقات',
             },
         ),
+        migrations.CreateModel(
+            name='ScopeSettings',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_enabled', models.BooleanField(default=False, verbose_name='تفعيل النطاقات')),
+            ],
+            options={
+                'verbose_name': 'إعدادات النطاق',
+                'verbose_name_plural': 'إعدادات النطاق',
+            },
+        ),
         migrations.AlterModelOptions(
             name='customuser',
             options={'permissions': [('manage_staff', 'صلاحية إنشاء مسؤول')], 'verbose_name': 'مستخدم', 'verbose_name_plural': 'المستخدمين'},

{micro_users-1.8.3 → micro_users-1.9.0}/users/models.py

@@ -14,6 +14,24 @@ class Scope(models.Model):
     class Meta:
         verbose_name = "نطاق"
         verbose_name_plural = "النطاقات"
+class ScopeSettings(models.Model):
+    is_enabled = models.BooleanField(default=False, verbose_name="تفعيل النطاقات")
+
+    class Meta:
+        verbose_name = "إعدادات النطاق"
+        verbose_name_plural = "إعدادات النطاق"
+
+    def save(self, *args, **kwargs):
+        self.pk = 1
+        super(ScopeSettings, self).save(*args, **kwargs)
+
+    @classmethod
+    def load(cls):
+        obj, created = cls.objects.get_or_create(pk=1)
+        return obj
+
+    def __str__(self):
+        return "إعدادات النطاق"
 
 class CustomUser(AbstractUser):
     phone = models.CharField(max_length=15, blank=True, null=True, verbose_name="رقم الهاتف")