changes in navigation bar

core/templates/base.html

@@ -31,6 +31,9 @@
     .navbar-brand, .nav-link { color: #fff !important; }
     .btn-primary { background-color: #2196F3; border-color: #2196F3; }
     footer { background-color: #0A1D37; color: #fff; padding: 3rem 0; }
+    .breadcrumb-container { background: #fff; border-bottom: 1px solid #eee; padding: 0.5rem 0; margin-bottom: 0; }
+    .breadcrumb-item a { text-decoration: none; color: #6c757d; }
+    .breadcrumb-item.active { color: #2196F3; font-weight: 600; }
   </style>
 </head>
 
@@ -50,11 +53,14 @@
       </button>
       <div class="collapse navbar-collapse" id="navbarNav">
         <ul class="navbar-nav ms-auto align-items-center">
+          <li class="nav-item">
+            <a class="nav-link" href="/">{% trans "Home" %}</a>
+          </li>
           {% if user.is_authenticated %}
             <li class="nav-item">
               <a class="nav-link" href="{% url 'dashboard' %}">{% trans "Dashboard" %}</a>
             </li>
-            {% if user.profile.role == 'TRUCK_OWNER' %}
+            {% if user.profile.role == 'SHIPPER' %}
             <li class="nav-item">
               <a class="nav-link" href="{% url 'marketplace' %}">{% trans "Marketplace" %}</a>
             </li>
@@ -117,6 +123,8 @@
     </div>
   </nav>
 
+  {% block breadcrumbs %}{% endblock %}
+
   {% if messages %}
   <div class="container mt-3">
     {% for message in messages %}
@@ -173,7 +181,6 @@
       <p class="text-center text-white-50 mb-0">&copy; 2026 {{ app_settings.app_name|default:"MASAR CARGO" }}. All rights reserved.</p>
     </div>
   </footer>
-<div class="container text-center text-muted small py-2">Debug: Lang={{ CURRENT_LANG }}, Cookie={{ request.COOKIES.django_language }}</div>
 
   <!-- Bootstrap 5 JS Bundle -->
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>

core/templates/core/admin_dashboard.html

@@ -3,6 +3,19 @@
 
 {% block title %}{% trans "Admin Dashboard" %} - MASAR CARGO{% endblock %}
 
+{% block breadcrumbs %}
+<div class="breadcrumb-container">
+    <div class="container">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item"><a href="/"><i class="fa-solid fa-house me-1"></i> {% trans "Home" %}</a></li>
+                <li class="breadcrumb-item active" aria-current="page">{% trans "Admin Dashboard" %}</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
 {% block content %}
 <div class="container py-5">
     <div class="row mb-4">
@@ -378,4 +391,4 @@
         border-bottom: none;
     }
 </style>
-{% endblock %}
+{% endblock %}

core/templates/core/article_detail.html

@@ -1,14 +1,36 @@
 {% extends 'base.html' %}
+{% load i18n %}
 
 {% block title %}{{ article.title }}{% endblock %}
 
-{% block content %}
-<div class="container mt-5">
-    <h1>{{ article.title }}</h1>
-    <p class="text-muted">Published on {{ article.created_at|date:"F d, Y" }}</p>
-    <hr>
-    <div>
-        {{ article.content|safe }}
+{% block breadcrumbs %}
+<div class="breadcrumb-container">
+    <div class="container">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item"><a href="/"><i class="fa-solid fa-house me-1"></i> {% trans "Home" %}</a></li>
+                <li class="breadcrumb-item active" aria-current="page">{{ article.title }}</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
+{% block content %}
+<div class="container py-4">
+    <div class="mb-4">
+        <a href="/" class="btn btn-outline-secondary btn-sm">
+            <i class="fa-solid fa-arrow-left me-1"></i> {% trans "Back to Home" %}
+        </a>
+    </div>
+
+    <h1>{{ article.title }}</h1>
+    {% if article.created_at %}
+    <p class="text-muted">{% trans "Published on" %} {{ article.created_at|date:"F d, Y" }}</p>
+    {% endif %}
+    <hr>
+    <div class="bg-white p-4 rounded shadow-sm">
+        {{ article.content|safe|linebreaks }}
     </div>
 </div>
 {% endblock %}

core/templates/core/marketplace.html

@@ -2,8 +2,28 @@
 {% load i18n %}
 {% load static %}
 
+{% block breadcrumbs %}
+<div class="breadcrumb-container">
+    <div class="container">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item"><a href="/"><i class="fa-solid fa-house me-1"></i> {% trans "Home" %}</a></li>
+                <li class="breadcrumb-item"><a href="{% url 'dashboard' %}">{% trans "Dashboard" %}</a></li>
+                <li class="breadcrumb-item active" aria-current="page">{% trans "Marketplace" %}</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
 {% block content %}
-<div class="container py-5">
+<div class="container py-4">
+    <div class="mb-4">
+        <a href="{% url 'dashboard' %}" class="btn btn-outline-secondary btn-sm">
+            <i class="fa-solid fa-arrow-left me-1"></i> {% trans "Back to Dashboard" %}
+        </a>
+    </div>
+
     <h2 class="mb-4">{% trans "Truck Marketplace" %}</h2>
     <p class="text-muted mb-4">{% trans "Browse available trucks and send your shipping offers directly to truck owners." %}</p>
     

core/templates/core/place_bid.html

@@ -1,8 +1,29 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{% block breadcrumbs %}
+<div class="breadcrumb-container">
+    <div class="container">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item"><a href="/"><i class="fa-solid fa-house me-1"></i> {% trans "Home" %}</a></li>
+                <li class="breadcrumb-item"><a href="{% url 'dashboard' %}">{% trans "Dashboard" %}</a></li>
+                <li class="breadcrumb-item"><a href="{% url 'marketplace' %}">{% trans "Marketplace" %}</a></li>
+                <li class="breadcrumb-item active" aria-current="page">{% trans "Send Offer" %}</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
 {% block content %}
-<div class="container py-5">
+<div class="container py-4">
+    <div class="mb-4">
+        <a href="{% url 'marketplace' %}" class="btn btn-outline-secondary btn-sm">
+            <i class="fa-solid fa-arrow-left me-1"></i> {% trans "Back to Marketplace" %}
+        </a>
+    </div>
+
     <div class="row justify-content-center">
         <div class="col-md-8 col-lg-7">
             <div class="card shadow-lg border-0">

core/templates/core/post_shipment.html

@@ -1,8 +1,28 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{% block breadcrumbs %}
+<div class="breadcrumb-container">
+    <div class="container">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item"><a href="/"><i class="fa-solid fa-house me-1"></i> {% trans "Home" %}</a></li>
+                <li class="breadcrumb-item"><a href="{% url 'dashboard' %}">{% trans "Dashboard" %}</a></li>
+                <li class="breadcrumb-item active" aria-current="page">{% trans "Add A Bid" %}</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
 {% block content %}
-<div class="container py-5">
+<div class="container py-4">
+    <div class="mb-4">
+        <a href="{% url 'dashboard' %}" class="btn btn-outline-secondary btn-sm">
+            <i class="fa-solid fa-arrow-left me-1"></i> {% trans "Back to Dashboard" %}
+        </a>
+    </div>
+
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card shadow border-0">

core/templates/core/shipment_detail.html

@@ -1,8 +1,28 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{% block breadcrumbs %}
+<div class="breadcrumb-container">
+    <div class="container">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item"><a href="/"><i class="fa-solid fa-house me-1"></i> {% trans "Home" %}</a></li>
+                <li class="breadcrumb-item"><a href="{% url 'dashboard' %}">{% trans "Dashboard" %}</a></li>
+                <li class="breadcrumb-item active" aria-current="page">{% trans "Shipment Details" %}</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
 {% block content %}
-<div class="container py-5">
+<div class="container py-4">
+    <div class="mb-4">
+        <a href="{% url 'dashboard' %}" class="btn btn-outline-secondary btn-sm">
+            <i class="fa-solid fa-arrow-left me-1"></i> {% trans "Back to Dashboard" %}
+        </a>
+    </div>
+
     <div class="row">
         <div class="col-md-8">
             <div class="card shadow-sm mb-4 border-0">

core/templates/core/shipper_dashboard.html

@@ -1,6 +1,19 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{% block breadcrumbs %}
+<div class="breadcrumb-container">
+    <div class="container">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item"><a href="/"><i class="fa-solid fa-house me-1"></i> {% trans "Home" %}</a></li>
+                <li class="breadcrumb-item active" aria-current="page">{% trans "Dashboard" %}</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
 {% block content %}
 <div class="container py-5">
     <div class="d-flex justify-content-between align-items-center mb-4">
@@ -129,4 +142,4 @@
         </div>
     </div>
 </div>
-{% endblock %}
+{% endblock %}

core/templates/core/truck_owner_dashboard.html

@@ -2,6 +2,19 @@
 {% load i18n %}
 {% load static %}
 
+{% block breadcrumbs %}
+<div class="breadcrumb-container">
+    <div class="container">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item"><a href="/"><i class="fa-solid fa-house me-1"></i> {% trans "Home" %}</a></li>
+                <li class="breadcrumb-item active" aria-current="page">{% trans "Dashboard" %}</li>
+            </ol>
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
 {% block content %}
 <div class="container py-5">
     <div class="d-flex justify-content-between align-items-center mb-4">
@@ -122,4 +135,4 @@
         {% endfor %}
     </div>
 </div>
-{% endblock %}
+{% endblock %}

core/templates/core/truck_register.html

@@ -1,9 +1,35 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{% block breadcrumbs %}
+<div class="breadcrumb-container">
+    <div class="container">
+        <nav aria-label="breadcrumb">
+            <ol class="breadcrumb mb-0">
+                <li class="breadcrumb-item"><a href="/"><i class="fa-solid fa-house me-1"></i> {% trans "Home" %}</a></li>
+                <li class="breadcrumb-item"><a href="{% url 'dashboard' %}">{% trans "Dashboard" %}</a></li>
+                <li class="breadcrumb-item active" aria-current="page">
+                    {% if edit_mode %}
+                        {% trans "Update Truck" %}
+                    {% else %}
+                        {% trans "Register Truck" %}
+                    {% endif %}
+                </li>
+            </ol>
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
 {% block content %}
 {% get_current_language as CURRENT_LANGUAGE %}
-<div class="container py-5">
+<div class="container py-4">
+    <div class="mb-4">
+        <a href="{% url 'dashboard' %}" class="btn btn-outline-secondary btn-sm">
+            <i class="fa-solid fa-arrow-left me-1"></i> {% trans "Back to Dashboard" %}
+        </a>
+    </div>
+
     <div class="row justify-content-center">
         <div class="col-md-10">
             <div class="card shadow">

core/templates/registration/login.html

@@ -4,6 +4,11 @@
 {% block content %}
 <section class="py-5">
     <div class="container">
+        <div class="mb-4">
+            <a href="/" class="btn btn-outline-secondary btn-sm">
+                <i class="fa-solid fa-arrow-left me-1"></i> {% trans "Back to Home" %}
+            </a>
+        </div>
         <div class="row justify-content-center">
             <div class="col-md-5">
                 <div class="card shadow">
@@ -30,4 +35,4 @@
         </div>
     </div>
 </section>
-{% endblock %}
+{% endblock %}

core/templates/registration/register.html

@@ -4,6 +4,11 @@
 {% block content %}
 <section class="py-5">
     <div class="container">
+        <div class="mb-4">
+            <a href="/" class="btn btn-outline-secondary btn-sm">
+                <i class="fa-solid fa-arrow-left me-1"></i> {% trans "Back to Home" %}
+            </a>
+        </div>
         <div class="row justify-content-center">
             <div class="col-md-6">
                 <div class="card shadow">
@@ -69,4 +74,4 @@
         </div>
     </div>
 </section>
-{% endblock %}
+{% endblock %}

core/templates/registration/verify_otp.html

@@ -3,6 +3,11 @@
 
 {% block content %}
 <div class="container py-5">
+    <div class="mb-4">
+        <a href="{% if purpose == 'registration' %}{% url 'register' %}{% else %}{% url 'login' %}{% endif %}" class="btn btn-outline-secondary btn-sm">
+            <i class="fa-solid fa-arrow-left me-1"></i> {% trans "Back" %}
+        </a>
+    </div>
     <div class="row justify-content-center">
         <div class="col-md-6">
             <div class="card shadow">
@@ -40,4 +45,4 @@
         </div>
     </div>
 </div>
-{% endblock %}
+{% endblock %}