title and other table ui changes

2025-05-26 17:27:15 +03:00 · 2025-05-26 17:27:15 +03:00 · d424637ef3
commit d424637ef3
parent 0988864285
36 changed files with 144 additions and 58 deletions
--- a/templates/account/user_settings.html
+++ b/templates/account/user_settings.html
@ -2,7 +2,7 @@
 {% load crispy_forms_filters %}
 {% load i18n static %}
 {% load allauth account %}
-{% block head_title %}
+{% block title %}
  {% trans 'User Settings' %}
 {% endblock %}
 {% block content %}
--- a/templates/admin_management/management.html
+++ b/templates/admin_management/management.html
@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% load i18n %}
+{%block title%} {%trans 'Admin Management' %}  {%endblock%}
 {% block content %}
  <h1 class="mt-4"><i class="fas fa-tools me-2"></i>Admin Management</h1>
  <div class="row row-cols-1 row-cols-md-4 g-4 mt-10">
--- a/templates/crm/leads/lead_form.html
+++ b/templates/crm/leads/lead_form.html
@ -1,5 +1,13 @@
 {% extends 'base.html' %}
 {% load i18n static crispy_forms_filters %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Lead'%}
+    {% else %}
+         {% trans 'Add New Lead'%}
+    {% endif %}
+{% endblock %}
 {% block customcss %}
    <style>
        .htmx-indicator{
--- a/templates/crm/leads/lead_tracking.html
+++ b/templates/crm/leads/lead_tracking.html
@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n static %}
-{% block title %}{{ _('Leads')|capfirst }}{% endblock title %}
+{% block title %}{{ _('Leads Tracking')|capfirst }}{% endblock title %}

 {% block customCSS %}
  <style>
--- a/templates/crm/opportunities/opportunity_detail.html
+++ b/templates/crm/opportunities/opportunity_detail.html
@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n static humanize %}
-
+{% block title %}{{ _("Opportunity Detail") }}{% endblock title %}
 {% block content %}
  <div class="row align-items-center justify-content-between g-3 mb-4">
    <div class="col-12 col-md-auto">
--- a/templates/crm/opportunities/opportunity_form.html
+++ b/templates/crm/opportunities/opportunity_form.html
@ -1,6 +1,13 @@
 {% extends 'base.html' %}
 {% load i18n static widget_tweaks custom_filters %}
-
+ {% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Opportunity'%}
+    {% else %}
+         {% trans 'Add New Opportunity'%}
+    {% endif %}
+{% endblock %}
 {% block content %}
  <div class="container-fluid">
    <div class="row g-3 mb-4 align-items-center">
--- a/templates/crm/opportunities/opportunity_list.html
+++ b/templates/crm/opportunities/opportunity_list.html
@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n static humanize %}
 {% load custom_filters %}
-
+{% block title %}{{ _("Opportunities") }}{% endblock title %}
 {% block content %}
  <div class="row g-3">
    <div class="col-12">
--- a/templates/customers/customer_form.html
+++ b/templates/customers/customer_form.html
@ -1,8 +1,14 @@
 {% extends "base.html" %}
 {% load i18n static%}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Customers" %}{% endblock title %}
-
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Customer'%}
+    {% else %}
+         {% trans 'Add New Customer'%}
+    {% endif %}
+{% endblock %}
 {% block content %}

    <link rel="stylesheet" href="{% static 'flags/sprite.css' %}">
--- a/templates/dealers/activity_log.html
+++ b/templates/dealers/activity_log.html
@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n static %}
+{%block title%}{% trans 'Activity'%}{%endblock%}
 {% block content %}
    <div class="row">
        <div class="ol-auto pt-5 pb-9">
--- a/templates/dealers/assign_car_makes.html
+++ b/templates/dealers/assign_car_makes.html
@ -1,6 +1,6 @@
 {% extends "base.html" %}
-{% load static %}
-
+{% load i18n static %}
+{%block title%} {% trans  'Car Makes'%}{%endblock%}
 {% block content %}
    <style>
        /* Your existing CSS styles here */
--- a/templates/dealers/dealer_detail.html
+++ b/templates/dealers/dealer_detail.html
@ -1,4 +1,7 @@
-{% extends 'base.html' %} {% load i18n static custom_filters%} {% block content %}
+{% extends 'base.html' %} 
+{% load i18n static custom_filters%}
+{%block title%}{%trans 'Profile'%} {%endblock%}
+{% block content %}
    <div class="container-fluid">
        <div class="row align-items-center justify-content-between g-3 mb-4">
            <div class="col-auto">
--- a/templates/groups/group_form.html
+++ b/templates/groups/group_form.html
@ -1,7 +1,14 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Group" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Group'%}
+    {% else %}
+         {% trans 'Add New Group'%}
+    {% endif %}
+{% endblock %}

 {% block content %}

--- a/templates/groups/group_list.html
+++ b/templates/groups/group_list.html
@ -2,7 +2,7 @@
 {% load i18n %}
 {% load render_table from django_tables2 %}

-{% block title %}{% trans "Group" %}{% endblock title %}
+{% block title %}{% trans "Groups" %}{% endblock title %}

 {% block content %}
    <section class="">
--- a/templates/inventory/car_form.html
+++ b/templates/inventory/car_form.html
@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n static custom_filters %}
+{%block title%} {%trans 'Add New Car'%} {%endblock%}
 {% block content %}
    <style>
    #video {
--- a/templates/inventory/car_list.html
+++ b/templates/inventory/car_list.html
@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load custom_filters %}
+
 {% block content %}
    <div class="row-fluid p-2">
        <!-- Display Validation Errors -->
--- a/templates/inventory/car_list_view.html
+++ b/templates/inventory/car_list_view.html
@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n custom_filters humanize %}
+{%block title%} {%trans 'Stocks'%} {%endblock%}
 {% block customCSS %}
    <style>
    .htmx-indicator{
--- a/templates/items/expenses/expense_create.html
+++ b/templates/items/expenses/expense_create.html
@ -2,7 +2,7 @@
 {% load crispy_forms_filters %}
 {% load static %}
 {% load i18n %}
-{% block title %}{{ _("Expenses") }}{% endblock title %}
+{% block title %}{{ _("Add New Expense") }}{% endblock title %}
 {% block content %}
    <div class="row">
        <div class="row justify-content-center">
--- a/templates/items/expenses/expense_update.html
+++ b/templates/items/expenses/expense_update.html
@ -2,7 +2,7 @@
 {% load crispy_forms_filters %}
 {% load static %}
 {% load i18n %}
-{% block title %}{{ _("Expenses") }}{% endblock title %}
+{% block title %}{{ _("Update Expense") }}{% endblock title %}
 {% block content %}
    <div class="row">
        <div class="row justify-content-center">
--- a/templates/items/service/service_create.html
+++ b/templates/items/service/service_create.html
@ -2,7 +2,16 @@
 {% load crispy_forms_filters %}
 {% load static %}
 {% load i18n %}
-{% block title %}{{ _("Service") }}{% endblock title %}
+
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Service'%}
+    {% else %}
+         {% trans 'Add New Service'%}
+    {% endif %}
+{% endblock %}
+
 {% block content %}
    <div class="container">
        <div class="row justify-content-center">
--- a/templates/ledger/bank_accounts/bank_account_form.html
+++ b/templates/ledger/bank_accounts/bank_account_form.html
@ -1,7 +1,15 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "bank account" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Bank Account'%}
+    {% else %}
+         {% trans 'Add New Bank Account'%}
+    {% endif %}
+{% endblock %}
+

 {% block content %}
    <div class="container">
--- a/templates/ledger/coa_accounts/account_form.html
+++ b/templates/ledger/coa_accounts/account_form.html
@ -1,7 +1,15 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "account" %}{% endblock title %}
+
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Account'%}
+    {% else %}
+         {% trans 'Add New Account'%}
+    {% endif %}
+{% endblock %}

 {% block content %}
    <div class="row my-5">
--- a/templates/ledger/reports/balance_sheet.html
+++ b/templates/ledger/reports/balance_sheet.html
@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% load custom_filters %}
-
+{%block title%}{%trans 'Balance Sheet'%} {%endblock%}

 {% block period_navigation %}
    {% if entity %}
--- a/templates/ledger/reports/cash_flow_statement.html
+++ b/templates/ledger/reports/cash_flow_statement.html
@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% load custom_filters %}
-
+{%block title%}{%trans 'Cash Flow Statement'%} {%endblock%}
 {% block period_navigation %}
    {% if unit_model and entity %}
        <div class="col-12">{% period_navigation 'unit-cf' %}</div>
--- a/templates/ledger/reports/income_statement.html
+++ b/templates/ledger/reports/income_statement.html
@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% load custom_filters %}
-
+{%block title%}{%trans 'Income Statement'%} {%endblock%}
 {% block period_navigation %}
    {% if unit_model %}
        <div class="col-12">{% period_navigation 'unit-ic' %}</div>
--- a/templates/organizations/organization_form.html
+++ b/templates/organizations/organization_form.html
@ -1,7 +1,14 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Add Organization" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Organization'%}
+    {% else %}
+         {% trans 'Add New Organization'%}
+    {% endif %}
+{% endblock %}
 {% block content %}

    <div class="container-fluid">
--- a/templates/plans/billing_info_create_or_update.html
+++ b/templates/plans/billing_info_create_or_update.html
@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n crispy_forms_filters %}
-
+{%block title%} {% trans  'Billing Information'%}{%endblock%}

 {% block content %}
    <div class="row mb-3">
--- a/templates/plans/invoices/layout.html
+++ b/templates/plans/invoices/layout.html
@ -95,9 +95,9 @@
    <div class="card-body p-0">
      <div class="table-responsive" style="overflow-x: auto;">
        <div style="min-width: 800px;"> <!-- Minimum width to ensure scrolling on smaller screens -->
-          <table class="table table-hover mb-0">
+          <table class="table align-items-center table-flush table-hover">
            <thead class="">
-              <tr>
+              <tr class="bg-body-highlight">
                <th class="text-center sticky-col" style="width: 5%; z-index: 1;">#</th>
                <th style="width: 25%; min-width: 200px;">{{ _("Description") }}</th>
                <th class="text-end" style="width: 10%; min-width: 100px;">{{ _("Unit Price")}}</th>
@ -109,7 +109,7 @@
                <th class="text-end" style="width: 10%; min-width: 100px;">{{ _("Subtotal") }}</th>
                <th class="text-center" style="width: 8%; min-width: 80px;">{{ _("VAT") }}</th>
                <th class="text-end" style="width: 10%; min-width: 100px;">{{ _("VAT Amount")}}</th>
-                <th class="text-end" style="width: 10%; min-width: 100px;">{{ _("Total") }}</th>
+                <th class="text-center" style="width: 10%; min-width: 100px;">{{ _("Total") }}</th>
              </tr>
            </thead>
            <tbody>
@ -125,7 +125,7 @@
                <td class="text-end">{{ invoice.total_net|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
                <td class="text-center">{% if invoice.tax != None %}{{ invoice.tax|floatformat }}%{% else %}n/a{% endif %}</td>
                <td class="text-end">{% if invoice.tax_total != None %}{{ invoice.tax_total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span>{% else %}{{ _("n/a")}}{% endif %}</td>
-                <td class="text-end fw-bold">{{ invoice.total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
+                <td class="text-center fw-bold">{{ invoice.total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
              </tr>
            </tbody>
            <tfoot class="">
@ -134,7 +134,7 @@
                <td class="text-end fw-bold">{{ invoice.total_net|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
                <td class="text-center fw-bold">{% if invoice.tax != None %}{{ invoice.tax|floatformat }}%{% else %}{{ _("n/a")}}{% endif %}</td>
                <td class="text-end fw-bold">{% if invoice.tax_total != None %}{{ invoice.tax_total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span>{% else %}{{ _("n/a")}}{% endif %}</td>
-                <td class="text-end fw-bold text-primary">{{ invoice.total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
+                <td class="text-center fw-bold text-primary">{{ invoice.total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
              </tr>
            </tfoot>
          </table>
--- a/templates/plans/order_detail.html
+++ b/templates/plans/order_detail.html
@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-
+{%block title%}{%trans 'Order Details'%} {%endblock%}

 {% block head %}
    <script>
@ -15,7 +15,7 @@


 {% block body %}
-    <h1>{% blocktrans with object.id as order_id and object.get_status_display as order_status %}Order #{{ order_id }}
+    <h1 class="mt-4">{% blocktrans with object.id as order_id and object.get_status_display as order_status %}Order #{{ order_id }}
        (status: {{ order_status }}){% endblocktrans %}</h1>

    {# You should provide displaying django messages in this template #}
@ -25,7 +25,7 @@
    {% endwith %}

    {% if object.get_all_invoices.count %}
-        <h2>{% trans "Printable documents" %}</h2>
+        <h2 class="mt-3">{% trans "Printable documents" %}</h2>
        <ul id="order_printable_documents">
            {% for invoice in object.get_all_invoices %}
                <li><a href="{{ invoice.get_absolute_url }}"
@ -37,10 +37,10 @@



-    <h2>{% trans "Payment" %}</h2>
+    <h2 class="mt-3">{% trans "Payment" %}</h2>
    {% if object.completed %}

-        <p class="alert alert-phoenix-success">
+        <p class="alert alert-phoenix-success mt-2">
            {% blocktrans with  object.completed as completed %}
                Payment completed on: {{ completed }}
            {% endblocktrans %}
@ -50,7 +50,7 @@
        {% if object.is_ready_for_payment %}
            {% block payment_method %}

-                <p>
+                <p class="mt-2">
                    Here should go bindings to your payment. We recommend using <a
                        href="https://github.com/cypreess/django-getpaid">django-getpaid</a> for payment processing.
                    Use a fake payment below to simulate paying for an order:
@ -72,7 +72,7 @@
            {% endblock %}
        {% else %}

-            <p class="alert alert-phoenix-warning">
+            <p class="alert alert-phoenix-warning mt-2">
                {% blocktrans %}
                    This order is expired. It will accept an incoming payment made earlier, but new payment cannot be
                    initialized. Please make a new order if necessary.
--- a/templates/plans/order_detail_table.html
+++ b/templates/plans/order_detail_table.html
@ -1,32 +1,32 @@
 {% load i18n %}

 {% block table %}
-  <div class="table-responsive px-1 scrollbar">
-    <table class="table fs-9 mb-0 border-top border-translucent">
+  <div class="table-responsive px-1 scrollbar mt-3">
+    <table class="table align-items-center table-flush table-hover">
      <thead>
-        <tr>
-          <th>{% trans "Name" %}</th>
-          <th>{% trans "Net price" %}</th>
-          <th>{% trans "VAT" %}</th>
-          <th>{% trans "VAT total" %}</th>
-          <th>{% trans "Total" %}</th>
-          <th>{% trans "Order completed" %}</th>
+        <tr class="bg-body-highlight">
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Name" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Net price" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "VAT" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "VAT total" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Total" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Order completed" %}</th>
          {% if order.user %}
-            <th>{% trans "Plan valid from" %}</th>
-            <th>{% trans "Plan valid until" %}</th>
+            <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Plan valid from" %}</th>
+            <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Plan valid until" %}</th>
          {% endif %}
        </tr>
      </thead>
      <tbody>
        <tr>
-          <td>{{ order.name }}</td>
-          <td>{{ order.amount }} {{ order.currency }}</td>
-          <td>{% if order.tax == None %}n/a{% else %}{{ order.tax }} %{% endif %}</td>
-          <td>{% if order.tax_total == None %}n/a{% else %}{{ order.tax_total }} {{ order.currency }}{% endif %}</td>
-          <td class="number total">{{ order.total }} {{ order.currency }}</td>
-          <td class="date">{{ order.completed|date|default:"-" }}</td>
-          <td class="date">{{ order.get_plan_extended_from|date|default:"-" }}</td>
-          <td class="date">{{ order.get_plan_extended_until|date|default:"-" }}</td>
+          <td class="align-middle product white-space-nowrap">{{ order.name }}</td>
+          <td class="align-middle product white-space-nowrap">{{ order.amount }} {{ order.currency }}</td>
+          <td class="align-middle product white-space-nowrap">{% if order.tax == None %}n/a{% else %}{{ order.tax }} %{% endif %}</td>
+          <td class="align-middle product white-space-nowrap">{% if order.tax_total == None %}n/a{% else %}{{ order.tax_total }} {{ order.currency }}{% endif %}</td>
+          <td class="number total align-middle product white-space-nowrap">{{ order.total }} {{ order.currency }}</td>
+          <td class="date align-middle product white-space-nowrap">{{ order.completed|date|default:"-" }}</td>
+          <td class="date align-middle product white-space-nowrap">{{ order.get_plan_extended_from|date|default:"-" }}</td>
+          <td class="date align-middle product white-space-nowrap">{{ order.get_plan_extended_until|date|default:"-" }}</td>
        </tr>
      </tbody>
    </table>
--- a/templates/plans/order_list.html
+++ b/templates/plans/order_list.html
@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n %}
-
+{%block title%}{%trans 'Plans Orders'%} {%endblock%}

 {% block body %}
    {% block order_header %}
--- a/templates/pricing_page.html
+++ b/templates/pricing_page.html
@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n static %}
 {% load custom_filters %}
+{%block title%} {% trans 'Upgrade Plan' %} {%endblock%}

 {% block customCSS %}
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css" integrity="sha512-X..." crossorigin="anonymous" referrerpolicy="no-referrer" />
--- a/templates/sales/invoices/invoice_detail.html
+++ b/templates/sales/invoices/invoice_detail.html
@ -2,7 +2,7 @@
 {% load i18n %}
 {% load tenhal_tag %}

-{% block title %}{{ _("View Estimate") }}{% endblock title %}
+{% block title %}{{ _("View Invoice") }}{% endblock title %}
 {% block customCSS %}
  <style>
    .disabled{
--- a/templates/sales/sales_list.html
+++ b/templates/sales/sales_list.html
@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load custom_filters %}
+{%block title%} {%trans 'Sales'%} {%endblock%}

 {% block customCSS %}
  <style>
--- a/templates/users/user_form.html
+++ b/templates/users/user_form.html
@ -1,7 +1,14 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Staff" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Staff'%}
+    {% else %}
+         {% trans 'Add New Staff'%}
+    {% endif %}
+{% endblock %}

 {% block content %}

--- a/templates/users/user_list.html
+++ b/templates/users/user_list.html
@ -2,7 +2,7 @@
 {% load i18n %}
 {% load render_table from django_tables2 %}

-{% block title %}{% trans "Staff" %}{% endblock title %}
+{% block title %}{% trans "Staffs" %}{% endblock title %}

 {% block content %}
    <section class="">
--- a/templates/vendors/vendor_form.html
+++ b/templates/vendors/vendor_form.html
@ -1,7 +1,15 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Vendors" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Vendor'%}
+    {% else %}
+         {% trans 'Add New Vendor'%}
+    {% endif %}
+{% endblock %}
+

 {% block content %}