diff --git a/NorahUniversity/__pycache__/settings.cpython-312.pyc b/NorahUniversity/__pycache__/settings.cpython-312.pyc index 99c93be..ee8b9a6 100644 Binary files a/NorahUniversity/__pycache__/settings.cpython-312.pyc and b/NorahUniversity/__pycache__/settings.cpython-312.pyc differ diff --git a/NorahUniversity/settings.py b/NorahUniversity/settings.py index 07e45d9..bc1e0ff 100644 --- a/NorahUniversity/settings.py +++ b/NorahUniversity/settings.py @@ -157,7 +157,7 @@ LOCALE_PATHS = [ BASE_DIR / 'locale', ] -TIME_ZONE = 'UTC' +TIME_ZONE = 'Asia/Riyadh' USE_I18N = True diff --git a/db.sqlite3 b/db.sqlite3 index 064b297..a610315 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/templates/base.html b/templates/base.html index 21eeb6b..2aac25d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -298,20 +298,32 @@
  • - - - + + + + {% trans "Training" %}
  • + + + + + + {% trans "Meetings" %} + + +
    • +
  • + - {% trans "Meetings" %} + {% trans "Form Templates" %}
    • diff --git a/templates/forms/form_builder.html b/templates/forms/form_builder.html index c7cd71b..842bc4e 100644 --- a/templates/forms/form_builder.html +++ b/templates/forms/form_builder.html @@ -9,10 +9,10 @@ /* Updated CSS styles with a new Teal/Aqua theme */ :root { /* New Color Palette (Teal/Aqua/Deep Blue) */ - --primary: #0081a7; /* Deep Teal/Cyan for main actions */ + --primary: #004a53; /* Deep Teal/Cyan for main actions */ --primary-light: #00b4d8; /* Brighter Aqua/Cyan */ --secondary: #005a78; /* Darker Teal for hover/accent */ - --success: #00cc99; /* Bright Greenish-Teal for success */ + --success: #005a78; /* Bright Greenish-Teal for success */ /* Neutral Colors (Kept for consistency) */ --light: #f4fcfc; /* Very light off-white (slightly blue tinted) */ @@ -160,7 +160,7 @@ } /* Stage Navigation - Fixed Height with Scroll */ .stage-nav-container { - height: 60px; + height: 100px; overflow-x: scroll; overflow-y: hidden; padding: 5px; @@ -175,6 +175,7 @@ min-width: 100%; padding: 0 10px; white-space: nowrap; + height:70px; } .stage-tab { padding: 12px 20px; diff --git a/templates/forms/form_templates_list.html b/templates/forms/form_templates_list.html index 57c9052..3f0dbfc 100644 --- a/templates/forms/form_templates_list.html +++ b/templates/forms/form_templates_list.html @@ -6,117 +6,140 @@ {% block customCSS %} + {% endblock %} {% block content %}
    -

    - Form Templates +

    + {% trans "Form Templates" %}

    - Create New Template + {% trans "Create New Template" %}
    -
    -
    -
    - - -
    + {# Search/Filter Area - Matching Job List Structure #} +
    +
    +
    Search Templates
    +
    + +
    + +
    + + +
    +
    + +
    +
    + + + {# Show Clear button if search is active #} + {% if query %} + + Clear Search + + {% endif %} +
    +
    + +
    + {% if templates %}
    {% for template in templates %}
    -
    -
    +
    +

    {{ template.name }}

    -
    +
    {{ template.created_at|date:"M d, Y" }} - {{ template.updated_at|timesince }} ago + {{ template.updated_at|timesince }} {% trans "ago" %}
    -
    -
    -
    {{ template.get_stage_count }}
    -
    Stages
    -
    -
    -
    {{ template.get_field_count }}
    -
    Fields
    + + {# Content area - includes stats and description #} +
    +
    +
    +
    {{ template.get_stage_count }}
    +
    {% trans "Stages" %}
    +
    +
    +
    {{ template.get_field_count }}
    +
    {% trans "Fields" %}
    +
    +

    + {% if template.description %} + {{ template.description|truncatewords:20 }} + {% else %} + {% trans "No description provided" %} + {% endif %} +

    -

    - {% if template.description %} - {{ template.description|truncatewords:20 }} - {% else %} - No description provided - {% endif %} -

    -
    - - Edit - - + + {# Action area - visually separated with pt-2 border-top #} +
    +
    + + {% trans "Preview" %} + + + {% trans "Edit" %} + + +
    @@ -223,71 +287,70 @@
    {% if templates.has_other_pages %} -
    -
    + {# Next page logic #} + {% if templates.has_next %} +
  • + Next +
    • +
  • + Last +
    • + {% endif %} + + {% endif %} {% else %} -
    - -

    No Form Templates Found

    -

    - {% if query %}No templates match your search "{{ query }}".{% else %}You haven't created any form templates yet.{% endif %} -

    - - Create Your First Template - +
    +
    + +

    {% trans "No Form Templates Found" %}

    +

    + {% if query %} + {% blocktrans with query=query %}No templates match your search "{{ query }}".{% endblocktrans %} + {% else %} + {% trans "You haven't created any form templates yet." %} + {% endif %} +

    + + {% trans "Create Your First Template" %} + +
    {% endif %}
    -{% include 'includes/delete_modal.html' %} +{% include 'includes/delete_modal.html' %} {% endblock %} -{% block extra_js %} +{% block customJS %}