Merge remote-tracking branch 'origin/main'

# Conflicts:
#	templates/inventory/car_list_view.html

inventory/views.py

@@ -1066,7 +1066,7 @@ class CarListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
     model = models.Car
     template_name = "inventory/car_list_view.html"
     context_object_name = "cars"
-    paginate_by = 30
+    paginate_by = 10
     permission_required = "inventory.view_car"
 
     def get_context_data(self, **kwargs):

templates/inventory/car_list_table.html

@@ -19,3 +19,6 @@
         </div>
     </div>
 {% endblock %}
+
+
+

templates/partials/pagination.html

@@ -1,90 +1,64 @@
 {% load i18n static %}
-
+<div class="d-flex justify-content-between align-items-center mt-4">
+                    <div class="text-body-secondary">
+                        {{ _("Showing") }} {{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }}
+                        {{ _("of") }} {{ page_obj.paginator.count }} {{ _("results") }}
+                    </div>
 <nav aria-label="Page navigation">
-    <ul class="pagination flex items-center justify-center space-x-2 py-4 text-sm">
+    <ul class="pagination mb-0">
         {# First Page Link #}
         {% if page_obj.has_previous %}
-            <li class="page-item rounded-md overflow-hidden">
-                <a class="page-link px-3 py-2 border border-gray-300 bg-white text-blue-600 hover:bg-gray-100 transition-colors duration-200" href="?page=1{% if q %}&q={{q}}{% endif %}" aria-label="{% trans 'First' %}">
-                    <span class="fas fa-angle-double-left" aria-hidden="true"></span>
-                    {% if LANGUAGE_CODE == 'ar' %}الأول{% else %}First{% endif %}
+            <li class="page-item">
+                <a class="page-link" href="?page=1{% if q %}&q={{q}}{% endif %}">
+             <span class="fas fa-angle-double-{% if LANGUAGE_CODE == 'ar' %}right{% else %}left{% endif %}"> </span>
                 </a>
             </li>
         {% else %}
-            <li class="page-item disabled rounded-md overflow-hidden">
-                <span class="page-link px-3 py-2 border border-gray-200 bg-gray-50 text-gray-400 cursor-not-allowed">
-                    <span class="fas fa-angle-double-left" aria-hidden="true"></span>
-                    {% if LANGUAGE_CODE == 'ar' %}الأول{% else %}First{% endif %}
+            <li class="page-item">
+                <span class="page-link">
+                    <span class="fas fa-chevron-{% if LANGUAGE_CODE == 'ar' %}right{% else %}left{% endif %}"> </span>
                 </span>
             </li>
         {% endif %}
 
         {# Previous Page Link #}
         {% if page_obj.has_previous %}
-            <li class="page-item rounded-md overflow-hidden">
-                <a class="page-link px-3 py-2 border border-gray-300 bg-white text-blue-600 hover:bg-gray-100 transition-colors duration-200" href="?page={{ page_obj.previous_page_number }}{% if q %}&q={{q}}{% endif %}" aria-label="{% trans 'Previous' %}">
-                    <span class="fas fa-chevron-left" aria-hidden="true"></span>
-                    <span class="">{% trans 'Previous' %}</span>
+            <li class="page-item">
+                <a class="page-link" href="?page={{ page_obj.previous_page_number }}{% if q %}&q={{q}}{% endif %}">
+              <span class="fas fa-chevron-{% if LANGUAGE_CODE == 'ar' %}right{% else %}left{% endif %}"></span>
                 </a>
             </li>
-        {% else %}
-            <li class="page-item disabled rounded-md overflow-hidden">
-                <span class="page-link px-3 py-2 border border-gray-200 bg-gray-50 text-gray-400 cursor-not-allowed">
-                    <span class="fas fa-chevron-left" aria-hidden="true"></span>
-                    <span class="">{% trans 'Previous' %}</span>
-                </span>
-            </li>
         {% endif %}
 
         {# Page Numbers #}
         {% for num in page_obj.paginator.page_range %}
-
             {% if num == 1 or num == page_obj.paginator.num_pages or num >= page_obj.number|add:-2 and num <= page_obj.number|add:2 %}
-                <li class="page-item rounded-md overflow-hidden {% if num == page_obj.number %}bg-blue-600 text-white shadow-md{% else %}bg-white text-blue-600 hover:bg-gray-100{% endif %}">
-                    <a class="page-link block px-3 py-2 border {% if num == page_obj.number %}border-blue-600{% else %}border-gray-300{% endif %} transition-colors duration-200"
+                <li class="page-item {% if num == page_obj.number %}active{% endif %}">
+                    <a class="page-link" {% if num == page_obj.number %}aria-current="page"{% endif %}
                        href="?page={{ num }}{% if q %}&q={{q}}{% endif %}">
                         {{ num }}
                     </a>
                 </li>
-            {% elif num == page_obj.number|add:-3 or num == page_obj.number|add:3 %}
-                <li class="page-item disabled rounded-md overflow-hidden">
-                    <span class="page-link px-3 py-2 border border-gray-300 bg-white text-gray-600 cursor-default">...</span>
-                </li>
             {% endif %}
         {% endfor %}
 
         {# Next Page Link #}
         {% if page_obj.has_next %}
-            <li class="page-item rounded-md overflow-hidden">
-                <a class="page-link px-3 py-2 border border-gray-300 bg-white text-blue-600 hover:bg-gray-100 transition-colors duration-200" href="?page={{ page_obj.next_page_number }}{% if q %}&q={{q}}{% endif %}" aria-label="{% trans 'Next' %}">
-                    <span class="fas fa-chevron-right" aria-hidden="true"></span>
-                    <span class="">{% trans 'Next' %}</span>
+            <li class="page-item">
+                <a class="page-link" href="?page={{ page_obj.next_page_number }}{% if q %}&q={{q}}{% endif %}">
+                    <span class="fas fa-chevron-{% if LANGUAGE_CODE == 'ar' %}left{% else %}right{% endif %}"></span>
                 </a>
             </li>
-        {% else %}
-            <li class="page-item disabled rounded-md overflow-hidden">
-                <span class="page-link px-3 py-2 border border-gray-200 bg-gray-50 text-gray-400 cursor-not-allowed">
-                    <span class="fas fa-chevron-right" aria-hidden="true"></span>
-                    <span class="">{% trans 'Next' %}</span>
-                </span>
-            </li>
         {% endif %}
 
         {# Last Page Link #}
         {% if page_obj.has_next %}
-            <li class="page-item rounded-md overflow-hidden">
-                <a class="page-link px-3 py-2 border border-gray-300 bg-white text-blue-600 hover:bg-gray-100 transition-colors duration-200" href="?page={{ page_obj.paginator.num_pages }}{% if q %}&q={{q}}{% endif %}" aria-label="{% trans 'Last' %}">
-                    <span class="fas fa-angle-double-right" aria-hidden="true"></span>
-                    {% if LANGUAGE_CODE == 'ar' %}الأخير{% else %}Last{% endif %}
+            <li class="page-item">
+                <a class="page-link" href="?page={{ page_obj.paginator.num_pages }}{% if q %}&q={{q}}{% endif %}">
+                 <span class="fas fa-angle-double-{% if LANGUAGE_CODE == 'ar' %}left{% else %}right{% endif %}"></span>
                 </a>
             </li>
-        {% else %}
-            <li class="page-item disabled rounded-md overflow-hidden">
-                <span class="page-link px-3 py-2 border border-gray-200 bg-gray-50 text-gray-400 cursor-not-allowed">
-                    <span class="fas fa-angle-double-right" aria-hidden="true"></span>
-                    {% if LANGUAGE_CODE == 'ar' %}الأخير{% else %}Last{% endif %}
-                </span>
-            </li>
         {% endif %}
     </ul>
 </nav>
+</div>